diff options
author | Scott Main <smain@google.com> | 2010-12-02 15:43:02 -0800 |
---|---|---|
committer | Scott Main <smain@google.com> | 2010-12-14 16:11:02 -0800 |
commit | b94df620959de658990c1ed1263e2e1c42df7f6b (patch) | |
tree | 8332e6df6e34ca5282bcc3bab182ebdaf5241c92 /docs/html/guide/topics/security | |
parent | 2bd83c00a0c72d3f6bd929c4df5fe83ee31b4704 (diff) | |
download | frameworks_base-b94df620959de658990c1ed1263e2e1c42df7f6b.zip frameworks_base-b94df620959de658990c1ed1263e2e1c42df7f6b.tar.gz frameworks_base-b94df620959de658990c1ed1263e2e1c42df7f6b.tar.bz2 |
cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee
docs: edit manifest samples to indicate <application> element is always last
Change-Id: I993d130c26efd87147913d5607a2e7f15bd12fe8
Diffstat (limited to 'docs/html/guide/topics/security')
-rw-r--r-- | docs/html/guide/topics/security/security.jd | 6 |
1 files changed, 2 insertions, 4 deletions
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 |