summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Ng <stevenckng@google.com> 2020-01-29 03:29:28 -0800
committer android-build-merger <android-build-merger@google.com> 2020-01-29 03:29:28 -0800
commit2b35dbe9acd338bb46747a1e9c6c363bd289a42b (patch)
treed498dff7e11ec7da47e2a4232eb703cafbeb1c93
parenta9e81b53a9828bc90e812fbd364d3cba3456bfa8 (diff)
parent6c63065a84ec3c586d04fa90381232aed7ac4427 (diff)
Merge "Grant READ_DREAM_STATE & WRITE_DREAM_STATE permissions to shell"
am: 6c63065a84 Change-Id: I55df56b081efbd5b68b4e0821c1b895ec6b15d7c
-rw-r--r--data/etc/privapp-permissions-platform.xml3
-rw-r--r--packages/Shell/AndroidManifest.xml4
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"