commit 05feded4f153707eadefe04f727be962b3e87778
author Adam Lesinski <adamlesinski@google.com> Tue Jun 23 21:43:07 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 23 21:43:07 2015 +0000
tree 02fced8b9ac5ef917322e51914a07b37517fab84
parent b497945f12f6b3af9a0020cf87aa6cadef390bf7
parent 8144aa2e9a732be6ba66c385a590e07ec59c5f77

am 8144aa2e: Merge "Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS" into mnc-dev

* commit '8144aa2e9a732be6ba66c385a590e07ec59c5f77':
  Allow system apps to be granted android.permission.PACKAGE_USAGE_STATS

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index f9b41a93..c51c061 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2090,7 +2090,7 @@
          <p>Declaring the permission implies intention to use the API and the user of the
          device can grant permission through the Settings application. -->
     <permission android:name="android.permission.PACKAGE_USAGE_STATS"
-        android:protectionLevel="signature|development|appop" />
+        android:protectionLevel="signature|system|development|appop" />
     <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
 
     <!-- @hide Allows an application to change the app idle state of an app.