diff options
author | Dianne Hackborn <hackbod@google.com> | 2014-10-06 19:22:53 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-06 19:22:53 +0000 |
commit | 2f577e83cbd5b12e47178a90443390210b446102 (patch) | |
tree | 0af80371684ebe02720fa58cb72d18926af90653 /tests | |
parent | 4795dfba7fb5f7c03e1f85ec2464258f4987d364 (diff) | |
parent | 90d557b7a68e64e049a44560b76b959ef87f13d7 (diff) | |
download | frameworks_base-2f577e83cbd5b12e47178a90443390210b446102.zip frameworks_base-2f577e83cbd5b12e47178a90443390210b446102.tar.gz frameworks_base-2f577e83cbd5b12e47178a90443390210b446102.tar.bz2 |
am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
* commit '90d557b7a68e64e049a44560b76b959ef87f13d7':
Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ActivityTests/AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ActivityTests/AndroidManifest.xml b/tests/ActivityTests/AndroidManifest.xml index f31f4f2..3930fd6 100644 --- a/tests/ActivityTests/AndroidManifest.xml +++ b/tests/ActivityTests/AndroidManifest.xml @@ -16,7 +16,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.google.android.test.activity"> - <uses-permission android:name="android.permission.GET_TASKS" /> + <uses-permission android:name="android.permission.REAL_GET_TASKS" /> <uses-permission android:name="android.permission.REORDER_TASKS" /> <uses-permission android:name="android.permission.REMOVE_TASKS" /> <uses-permission android:name="android.permission.READ_FRAME_BUFFER" /> |