summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJeff Hamilton <jham@android.com>2011-03-30 09:30:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-30 09:30:40 -0700
commitb98967942e9a764b80abc8ff1c6f6f2d620c0f7a (patch)
treecbb3e1aaaf548359ce0f6dcbb5f95c0ea2b70428 /core
parent11ebb6f5020761b9b8373a5e0d777fb91a2b92c2 (diff)
parent96cf34d362a1666683e813af915e4f6e0d1b38a0 (diff)
downloadframeworks_base-b98967942e9a764b80abc8ff1c6f6f2d620c0f7a.zip
frameworks_base-b98967942e9a764b80abc8ff1c6f6f2d620c0f7a.tar.gz
frameworks_base-b98967942e9a764b80abc8ff1c6f6f2d620c0f7a.tar.bz2
am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
* commit '96cf34d362a1666683e813af915e4f6e0d1b38a0': Make STOP_APP_SWITCHES signatureOrSystem.
Diffstat (limited to 'core')
-rw-r--r--core/res/AndroidManifest.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index c8295d7..c6ddb56 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1022,7 +1022,7 @@
<permission android:name="android.permission.STOP_APP_SWITCHES"
android:label="@string/permlab_stopAppSwitches"
android:description="@string/permdesc_stopAppSwitches"
- android:protectionLevel="signature" />
+ android:protectionLevel="signatureOrSystem" />
<!-- Allows an application to retrieve the current state of keys and
switches. This is only for use by the system.-->