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