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

Merge "Grant READ_DREAM_STATE & WRITE_DREAM_STATE permissions to shell" am: 6c63065a84 am: 2b35dbe9ac

Browse Source 
Change-Id: I4a91b7915fe948c57dda1112c743d010dcd7e67c
This commit is contained in:
Automerger Merge Worker
2020-01-29 11:44:50 +00:00
parent f751b9ec06 2b35dbe9ac
commit b087e5b202
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -343,6 +343,9 @@ applications that come with the platform
<permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/> <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
<!-- Permission required for Tethering CTS tests. --> <!-- Permission required for Tethering CTS tests. -->
<permission name="android.permission.TETHER_PRIVILEGED"/> <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>
<privapp-permissions package="com.android.statementservice"> <privapp-permissions package="com.android.statementservice">

4
packages/Shell/AndroidManifest.xml
View File

@@ -220,6 +220,10 @@
<!-- Permission required for CTS test - TetheringManagerTest --> <!-- Permission required for CTS test - TetheringManagerTest -->
<uses-permission android:name="android.permission.TETHER_PRIVILEGED"/> <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" <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"