summaryrefslogtreecommitdiffstats
path: root/packages/Shell
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-10-06 19:17:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-06 19:17:10 +0000
commit90d557b7a68e64e049a44560b76b959ef87f13d7 (patch)
treec519e6aed705f8575ab78d599ea72fd41a486f48 /packages/Shell
parent3647aba82d30143e301d4bb251085f79308d872a (diff)
parent7f7d240b13b96b617e298c6178af0425308f5ef9 (diff)
downloadframeworks_base-90d557b7a68e64e049a44560b76b959ef87f13d7.zip
frameworks_base-90d557b7a68e64e049a44560b76b959ef87f13d7.tar.gz
frameworks_base-90d557b7a68e64e049a44560b76b959ef87f13d7.tar.bz2
am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9': Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
Diffstat (limited to 'packages/Shell')
-rw-r--r--packages/Shell/AndroidManifest.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 9f9dc23..7e6afa6 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -39,7 +39,7 @@
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
<!-- System tool permissions granted to the shell. -->
- <uses-permission android:name="android.permission.GET_TASKS" />
+ <uses-permission android:name="android.permission.REAL_GET_TASKS" />
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
<uses-permission android:name="android.permission.REORDER_TASKS" />
<uses-permission android:name="android.permission.SET_ANIMATION_SCALE" />