Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Give CONTROL_DEVICE_LIGHTS permission to the shell" am: 668daf0341

Browse Source 
Change-Id: I8f0d55f7a310e6dff8cf552e5ddf929eb8d0c2b7
This commit is contained in:
Automerger Merge Worker
2020-02-11 22:14:58 +00:00
parent c1363ad2b9 668daf0341
commit 285f6781c1
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/etc/privapp-permissions-platform.xml
View File

@@ -350,6 +350,8 @@ applications that come with the platform
<!-- Permissions required to test ambient display. --> <!-- Permissions required to test ambient display. -->
<permission name="android.permission.READ_DREAM_STATE" /> <permission name="android.permission.READ_DREAM_STATE" />
<permission name="android.permission.WRITE_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"/> <permission name="android.permission.REBOOT"/>
</privapp-permissions> </privapp-permissions>

3
packages/Shell/AndroidManifest.xml
View File

@@ -236,6 +236,9 @@
<!-- Permission needed to test mainline permission module rollback --> <!-- Permission needed to test mainline permission module rollback -->
<uses-permission android:name="android.permission.UPGRADE_RUNTIME_PERMISSIONS" /> <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" <application android:label="@string/app_label"
android:theme="@android:style/Theme.DeviceDefault.DayNight" android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:defaultToDeviceProtectedStorage="true" android:defaultToDeviceProtectedStorage="true"