summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2022-02-24 07:38:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-02-24 07:38:54 +0000
commita72c59093b6621c407a80112164b80c00a4687d2 (patch)
tree6d3b67aaf1d010a9096cec10b5722b724432c9fb
parent5fdccc4578f8dba08b8c3049f1421626dd2626ce (diff)
parent24d521a6bb3fe5cf0a24b0b619a163427a8f7b60 (diff)
Merge "Add shell permission for CTS test" am: 94dd832f60 am: 24d521a6bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972639 Change-Id: Ib5e6052391cddcd2a466088b9ebe70e6a1d5466f
-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 8b27522cd5b0..ca4dcbbf230e 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -559,6 +559,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" />