summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorZoltan Szatmary-Ban <szatmz@google.com>2015-05-11 16:24:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-11 16:24:52 +0000
commit11a1086f69abafc17e4fc6db38622d126a1a7ecc (patch)
tree145dc69484a21e3d730a9e40d46736c1475f061c /core/res
parentb3100f4b13159deb0b5736aedca1659dfe3c762b (diff)
parent763e170f58fb2f2221f615c7802521f7627039df (diff)
downloadframeworks_base-11a1086f69abafc17e4fc6db38622d126a1a7ecc.zip
frameworks_base-11a1086f69abafc17e4fc6db38622d126a1a7ecc.tar.gz
frameworks_base-11a1086f69abafc17e4fc6db38622d126a1a7ecc.tar.bz2
Merge "Improve javadoc on android.permission.PACKAGE_USAGE_STATS" into mnc-dev
Diffstat (limited to 'core/res')
-rw-r--r--core/res/AndroidManifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 7b53578..e5bba6e 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2103,7 +2103,8 @@
<!-- @SystemApi Allows an application to collect component usage
statistics
- <p>Not for use by third-party applications. -->
+ <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" />
<uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />