diff options
| author | 2020-02-03 23:35:01 +0000 | |
|---|---|---|
| committer | 2020-02-03 23:35:01 +0000 | |
| commit | 40ac77aac577ff865af82a78b5cb19ece5e5b4ec (patch) | |
| tree | 5bc4199877820639ca29c4ac93c8a7c1e5605f61 | |
| parent | b91132c6fcead50147c3af10cb89245523c289d7 (diff) | |
| parent | 1ef721380ab9964721c23267c37de3328804cb06 (diff) | |
Merge "Grant shell REBOOT permission"
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 1 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index b9047e47ed8d..692af584cd61 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -372,6 +372,7 @@ applications that come with the platform <permission name="android.permission.CONTROL_DEVICE_LIGHTS" /> <!-- Permission required for ShortcutManagerUsageTest CTS test. --> <permission name="android.permission.ACCESS_SHORTCUTS"/> + <permission name="android.permission.REBOOT"/> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 3c511dd6fe0b..6a89b71be897 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -91,6 +91,7 @@ <uses-permission android:name="android.permission.TEST_MANAGE_ROLLBACKS" /> <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" /> <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.POWER_SAVER" /> <uses-permission android:name="android.permission.INSTALL_LOCATION_PROVIDER" /> |