diff options
| author | 2020-02-11 21:55:09 +0000 | |
|---|---|---|
| committer | 2020-02-11 21:55:09 +0000 | |
| commit | 668daf03416525dbcd96f2a06b2fd5dccb7cec13 (patch) | |
| tree | 5a27b3d9a884c74bc36c844cecf9adf8f68bd2c1 | |
| parent | cb47d8615838dcbda63e30df9d3b88414a87b7d2 (diff) | |
| parent | 9be54b5b67585724228fbaa5340302d718484b79 (diff) | |
Merge "Give CONTROL_DEVICE_LIGHTS permission to the shell"
| -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 1bc59248de42..821909da2490 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -350,6 +350,8 @@ applications that come with the platform <!-- Permissions required to test ambient display. --> <permission name="android.permission.READ_DREAM_STATE" /> <permission name="android.permission.WRITE_DREAM_STATE" /> + <!-- Permission required to test lights control APIs. --> + <permission name="android.permission.CONTROL_DEVICE_LIGHTS" /> <permission name="android.permission.REBOOT"/> </privapp-permissions> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 0ffbe80d4ab3..57821c58f768 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -236,6 +236,9 @@ <!-- Permission needed to test mainline permission module rollback --> <uses-permission android:name="android.permission.UPGRADE_RUNTIME_PERMISSIONS" /> + <!-- Permission required for CTS test - CtsLightsManagerTest --> + <uses-permission android:name="android.permission.CONTROL_DEVICE_LIGHTS" /> + <application android:label="@string/app_label" android:theme="@android:style/Theme.DeviceDefault.DayNight" android:defaultToDeviceProtectedStorage="true" |