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

Merge "Grant shell REBOOT permission" am: a656dd889d

Browse Source 
Change-Id: I103de65e0ac50151556c69efafaa63911a821acb
This commit is contained in:
Automerger Merge Worker
2020-02-04 23:14:07 +00:00
parent 6461a7e81c a656dd889d
commit 1e43248938
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -346,6 +346,7 @@ 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 name="android.permission.REBOOT"/>
</privapp-permissions> </privapp-permissions>
<privapp-permissions package="com.android.statementservice"> <privapp-permissions package="com.android.statementservice">

1
packages/Shell/AndroidManifest.xml
View File

@@ -91,6 +91,7 @@
<uses-permission android:name="android.permission.TEST_MANAGE_ROLLBACKS" /> <uses-permission android:name="android.permission.TEST_MANAGE_ROLLBACKS" />
<uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" /> <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" />
<uses-permission android:name="android.permission.READ_FRAME_BUFFER" /> <uses-permission android:name="android.permission.READ_FRAME_BUFFER" />
<uses-permission android:name="android.permission.REBOOT" />
<uses-permission android:name="android.permission.DEVICE_POWER" /> <uses-permission android:name="android.permission.DEVICE_POWER" />
<uses-permission android:name="android.permission.POWER_SAVER" /> <uses-permission android:name="android.permission.POWER_SAVER" />
<uses-permission android:name="android.permission.INSTALL_LOCATION_PROVIDER" /> <uses-permission android:name="android.permission.INSTALL_LOCATION_PROVIDER" />