diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-16 15:41:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-16 15:41:36 +0000 |
| commit | 18f564629a1c90c10594cd01bbd8dc41557860dc (patch) | |
| tree | ce933e4dfee784ca109b45ded1dfa4ec2269ca14 | |
| parent | aad0a30aa1bdfd5f921ef3855601f68b4e242cfc (diff) | |
| parent | d7781b465e8335570be6f8dd964fe9123cd7737c (diff) | |
Merge "Grant HDMI_CEC permission to Shell" am: 63340382e0 am: d7781b465e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469448
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib0540d3bb3989e436c98d222aff6aa4c30a630a2
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 2 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index e8c5662c1414..cc66c9509fd5 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -437,6 +437,8 @@ applications that come with the platform <permission name="android.permission.MANAGE_DEBUGGING" /> <!-- Permissions required for CTS test - TimeManagerTest --> <permission name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION" /> + <!-- Permissions required for CTS test - CtsHdmiCecHostTestCases --> + <permission name="android.permission.HDMI_CEC"/> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 5d6c4c35560c..0fdb282edc23 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -334,6 +334,9 @@ <!-- Permission needed for CTS test - TimeManagerTest --> <uses-permission android:name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION" /> + <!-- Permission needed for CTS test - CtsHdmiCecHostTestCases --> + <uses-permission android:name="android.permission.HDMI_CEC" /> + <application android:label="@string/app_label" android:theme="@android:style/Theme.DeviceDefault.DayNight" android:defaultToDeviceProtectedStorage="true" |