summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2022-02-24 08:21:25 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-02-24 08:21:25 +0000
commit4ac3a70c0fc3c25764bafcbc23a5d33794ca24a5 (patch)
tree1e3ae1c630805b96195e82e16895b1f1181cf981
parent7a814173d032bfa7e0dd9edc1d69dd5de5cb101e (diff)
parentcc2d08db857f8eb62b8a454111398835a453d6c6 (diff)
Merge "Add shell permission for CTS test" am: 94dd832f60 am: 24d521a6bb am: a72c59093b am: cc2d08db85
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972639 Change-Id: I5b68e98f23af50f2c1845a55422373e1bad1adb3
-rw-r--r--packages/Shell/AndroidManifest.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 121f9e58a62a..c0e2b2ef361f 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -593,6 +593,9 @@
<uses-permission android:name="android.permission.MANAGE_APP_HIBERNATION"/>
+ <!-- Permission required for CTS test - MediaCodecResourceTest -->
+ <uses-permission android:name="android.permission.MEDIA_RESOURCE_OVERRIDE_PID" />
+
<!-- Permission required for CTS test - ResourceObserverNativeTest -->
<uses-permission android:name="android.permission.REGISTER_MEDIA_RESOURCE_OBSERVER" />