summaryrefslogtreecommitdiffstats
path: root/packages/Shell
diff options
context:
space:
mode:
authorNicholas Sauer <nicksauer@google.com>2015-08-26 18:53:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-26 18:53:07 +0000
commit5554a4eb63101cb642637a025d606f77b98c7656 (patch)
tree1fa6c93d41ca2ebbe9380b6401ad640a64fb568f /packages/Shell
parent75713dd51cf917d7cf542d022e8215e7fd60e8f4 (diff)
parent6c97bb1b744ff67ad5ec3d590bbf511c165672ee (diff)
downloadframeworks_base-5554a4eb63101cb642637a025d606f77b98c7656.zip
frameworks_base-5554a4eb63101cb642637a025d606f77b98c7656.tar.gz
frameworks_base-5554a4eb63101cb642637a025d606f77b98c7656.tar.bz2
am 6c97bb1b: am 59af87c2: am 7c17ec5f: Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev
* commit '6c97bb1b744ff67ad5ec3d590bbf511c165672ee': Add GET_APP_OPS_STATS to Shell
Diffstat (limited to 'packages/Shell')
-rw-r--r--packages/Shell/AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index c00fdf3..37e0db0 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -104,6 +104,7 @@
<uses-permission android:name="android.permission.REGISTER_CALL_PROVIDER" />
<uses-permission android:name="android.permission.REGISTER_CONNECTION_MANAGER" />
<uses-permission android:name="android.permission.REGISTER_SIM_SUBSCRIPTION" />
+ <uses-permission android:name="android.permission.GET_APP_OPS_STATS" />
<application android:label="@string/app_label">
<provider