summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/topics/manifest
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html/guide/topics/manifest')
-rw-r--r--docs/html/guide/topics/manifest/manifest-intro.jd4
-rw-r--r--docs/html/guide/topics/manifest/permission-tree-element.jd2
-rw-r--r--docs/html/guide/topics/manifest/uses-feature-element.jd12
3 files changed, 6 insertions, 12 deletions
diff --git a/docs/html/guide/topics/manifest/manifest-intro.jd b/docs/html/guide/topics/manifest/manifest-intro.jd
index efbfa5a..d7a3e3e 100644
--- a/docs/html/guide/topics/manifest/manifest-intro.jd
+++ b/docs/html/guide/topics/manifest/manifest-intro.jd
@@ -441,6 +441,7 @@ element. For example, an activity could be protected as follows:
<pre>
&lt;manifest . . . &gt;
&lt;permission android:name="com.example.project.DEBIT_ACCT" . . . /&gt;
+ &lt;uses-permission android:name="com.example.project.DEBIT_ACCT" /&gt;
. . .
&lt;application . . .&gt;
&lt;activity android:name="com.example.project.FreneticActivity"
@@ -449,9 +450,6 @@ element. For example, an activity could be protected as follows:
. . .
&lt;/activity&gt;
&lt;/application&gt;
- . . .
- &lt;uses-permission android:name="com.example.project.DEBIT_ACCT" /&gt;
- . . .
&lt;/manifest&gt;
</pre>
diff --git a/docs/html/guide/topics/manifest/permission-tree-element.jd b/docs/html/guide/topics/manifest/permission-tree-element.jd
index aecc930..6d6cd0a 100644
--- a/docs/html/guide/topics/manifest/permission-tree-element.jd
+++ b/docs/html/guide/topics/manifest/permission-tree-element.jd
@@ -42,7 +42,7 @@ when the application is ready to be published, it should be set as a
reference to a string resource, so that it can be localized like other
strings in the user interface.</dd>
-<dt><a name="nm"</a>{@code android:name}</dt>
+<dt><a name="nm"></a>{@code android:name}</dt>
<dd>The name that's at the base of the permission tree. It serves as
a prefix to all permission names in the tree. Java-style scoping should
be used to ensure that the name is unique. The name must have more than
diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd
index 6652aff..2e43c30 100644
--- a/docs/html/guide/topics/manifest/uses-feature-element.jd
+++ b/docs/html/guide/topics/manifest/uses-feature-element.jd
@@ -403,10 +403,9 @@ declares a Bluetooth permission, but does not declare the Bluetooth feature in a
</dl>
<pre>&lt;manifest ...>
-...
&lt;uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
&lt;uses-sdk android:minSdkVersion="3" />
-...
+ ...
&lt;/manifest></pre>
<dl>
@@ -418,10 +417,9 @@ including devices running older versions of the platform. </dd>
</dl>
<pre>&lt;manifest ...>
-...
&lt;uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
&lt;uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" />
-...
+ ...
&lt;/manifest></pre>
<dl>
@@ -430,11 +428,10 @@ including devices running older versions of the platform. </dd>
</dl>
<pre>&lt;manifest ...>
-...
&lt;uses-feature android:name="android.hardware.bluetooth" />
&lt;uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
&lt;uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" />
-...
+ ...
&lt;/manifest></pre>
<dl>
@@ -445,11 +442,10 @@ feature support, for all devices.</dd>
</dl>
<pre>&lt;manifest ...>
-...
&lt;uses-feature android:name="android.hardware.bluetooth" android:required="false" />
&lt;uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
&lt;uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" />
-...
+ ...
&lt;/manifest></pre>