summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorBjorn Bringert <bringert@android.com>2011-02-23 02:30:57 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-23 02:30:57 -0800
commitceb1997174769e1c2c9b8a368a9b63d816a1555d (patch)
tree63509ae77f9f6ad70c10c25ca722e11182de648d /core/res
parent176b8d01b931096cbd8154e9b0e8d9ffc14f406d (diff)
parent8d224caf989b212f8e633cc1a8b0db453300a742 (diff)
downloadframeworks_base-ceb1997174769e1c2c9b8a368a9b63d816a1555d.zip
frameworks_base-ceb1997174769e1c2c9b8a368a9b63d816a1555d.tar.gz
frameworks_base-ceb1997174769e1c2c9b8a368a9b63d816a1555d.tar.bz2
Merge "ActivityManager exposes launch count API."
Diffstat (limited to 'core/res')
-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 1df6fe5..12d7afd 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1196,7 +1196,7 @@
<permission android:name="android.permission.PACKAGE_USAGE_STATS"
android:label="@string/permlab_pkgUsageStats"
android:description="@string/permdesc_pkgUsageStats"
- android:protectionLevel="signature" />
+ android:protectionLevel="signatureOrSystem" />
<!-- Allows an application to collect battery statistics -->
<permission android:name="android.permission.BATTERY_STATS"