diff options
| author | 2020-01-29 11:44:50 +0000 | |
|---|---|---|
| committer | 2020-01-29 11:44:50 +0000 | |
| commit | b087e5b202e17b4c82f5006ae4acfa234bbefc8c (patch) | |
| tree | 9139ace3c8e69d82407bd9f7809cedaf3c1f4553 | |
| parent | f751b9ec06563dc988f48c61a6dbd7e1070667ca (diff) | |
| parent | 2b35dbe9acd338bb46747a1e9c6c363bd289a42b (diff) | |
Merge "Grant READ_DREAM_STATE & WRITE_DREAM_STATE permissions to shell" am: 6c63065a84 am: 2b35dbe9ac
Change-Id: I4a91b7915fe948c57dda1112c743d010dcd7e67c
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 3 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index eec2072c6d5d..7f9a4ecb0171 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -343,6 +343,9 @@ applications that come with the platform <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/> <!-- Permission required for Tethering CTS tests. --> <permission name="android.permission.TETHER_PRIVILEGED"/> + <!-- Permissions required to test ambient display. --> + <permission name="android.permission.READ_DREAM_STATE" /> + <permission name="android.permission.WRITE_DREAM_STATE" /> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 14c77955939f..5a5a7576484e 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -220,6 +220,10 @@ <!-- Permission required for CTS test - TetheringManagerTest --> <uses-permission android:name="android.permission.TETHER_PRIVILEGED"/> + <!-- Permissions required to test ambient display. --> + <uses-permission android:name="android.permission.READ_DREAM_STATE"/> + <uses-permission android:name="android.permission.WRITE_DREAM_STATE"/> + <application android:label="@string/app_label" android:theme="@android:style/Theme.DeviceDefault.DayNight" android:defaultToDeviceProtectedStorage="true" |