diff options
author | Dianne Hackborn <hackbod@google.com> | 2011-01-26 14:15:08 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-26 14:15:08 -0800 |
commit | 49295e5379472c22af8975e32271f9659c016531 (patch) | |
tree | 731d332044cc0376d7e1be100df9fc3d0969e21d /core/res | |
parent | b8efdf7f80d9aa2cbeff881f22d283cf5045c379 (diff) | |
parent | ccd79399cc2a28d79287fd1558c5f5a530356003 (diff) | |
download | frameworks_base-49295e5379472c22af8975e32271f9659c016531.zip frameworks_base-49295e5379472c22af8975e32271f9659c016531.tar.gz frameworks_base-49295e5379472c22af8975e32271f9659c016531.tar.bz2 |
am ccd79399: am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
* commit 'ccd79399cc2a28d79287fd1558c5f5a530356003':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
Diffstat (limited to 'core/res')
-rw-r--r-- | core/res/AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index bd0cd35..a91829c 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1095,7 +1095,7 @@ <permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" android:label="@string/permlab_changeComponentState" android:description="@string/permdesc_changeComponentState" - android:protectionLevel="signature" /> + android:protectionLevel="signatureOrSystem" /> <!-- Allows an application to use SurfaceFlinger's low level features --> <permission android:name="android.permission.ACCESS_SURFACE_FLINGER" |