summaryrefslogtreecommitdiffstats
path: root/packages/Shell
diff options
context:
space:
mode:
authorNicholas Sauer <nicksauer@google.com>2015-08-26 18:31:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-26 18:31:33 +0000
commit6c97bb1b744ff67ad5ec3d590bbf511c165672ee (patch)
tree13578e8f8d54e22a5284f5bb09432a940f41b2f7 /packages/Shell
parent9b4b427a4b7906a16e5f0ca15099446004d8df75 (diff)
parent59af87c2b694fad361c5f7e053a19bf9e1483afa (diff)
downloadframeworks_base-6c97bb1b744ff67ad5ec3d590bbf511c165672ee.zip
frameworks_base-6c97bb1b744ff67ad5ec3d590bbf511c165672ee.tar.gz
frameworks_base-6c97bb1b744ff67ad5ec3d590bbf511c165672ee.tar.bz2
am 59af87c2: am 7c17ec5f: Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev
* commit '59af87c2b694fad361c5f7e053a19bf9e1483afa': 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