diff options
Diffstat (limited to 'docs/html/guide/topics')
5 files changed, 9 insertions, 16 deletions
diff --git a/docs/html/guide/topics/data/backup.jd b/docs/html/guide/topics/data/backup.jd index 623ee22..7661a0e 100644 --- a/docs/html/guide/topics/data/backup.jd +++ b/docs/html/guide/topics/data/backup.jd @@ -166,6 +166,7 @@ href="{@docRoot}guide/topics/manifest/application-element.html">{@code <pre> <manifest ... > + ... <application android:label="MyApplication" <b>android:backupAgent="MyBackupAgent"</b>> <activity ... > 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> <manifest . . . > <permission android:name="com.example.project.DEBIT_ACCT" . . . /> + <uses-permission android:name="com.example.project.DEBIT_ACCT" /> . . . <application . . .> <activity android:name="com.example.project.FreneticActivity" @@ -449,9 +450,6 @@ element. For example, an activity could be protected as follows: . . . </activity> </application> - . . . - <uses-permission android:name="com.example.project.DEBIT_ACCT" /> - . . . </manifest> </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><manifest ...> -... <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-sdk android:minSdkVersion="3" /> -... + ... </manifest></pre> <dl> @@ -418,10 +417,9 @@ including devices running older versions of the platform. </dd> </dl> <pre><manifest ...> -... <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" /> -... + ... </manifest></pre> <dl> @@ -430,11 +428,10 @@ including devices running older versions of the platform. </dd> </dl> <pre><manifest ...> -... <uses-feature android:name="android.hardware.bluetooth" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" /> -... + ... </manifest></pre> <dl> @@ -445,11 +442,10 @@ feature support, for all devices.</dd> </dl> <pre><manifest ...> -... <uses-feature android:name="android.hardware.bluetooth" android:required="false" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" /> -... + ... </manifest></pre> diff --git a/docs/html/guide/topics/security/security.jd b/docs/html/guide/topics/security/security.jd index de0c6e5..2e31940 100644 --- a/docs/html/guide/topics/security/security.jd +++ b/docs/html/guide/topics/security/security.jd @@ -120,9 +120,8 @@ specify:</p> <pre><manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.app.myapp" > - <uses-permission android:name="android.permission.RECEIVE_SMS" /> - + ... </manifest></pre> <p>At application install time, permissions requested by the application are @@ -175,13 +174,12 @@ of its activities could declare a permission for this operation as follows:</p> <pre><manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.me.app.myapp" > - <permission android:name="com.me.app.myapp.permission.DEADLY_ACTIVITY" android:label="@string/permlab_deadlyActivity" android:description="@string/permdesc_deadlyActivity" android:permissionGroup="android.permission-group.COST_MONEY" android:protectionLevel="dangerous" /> - + ... </manifest></pre> <p>The {@link android.R.styleable#AndroidManifestPermission_protectionLevel |