commit 40ac77aac577ff865af82a78b5cb19ece5e5b4ec
author Nikita Ioffe <ioffe@google.com> Mon Feb 03 23:35:01 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 03 23:35:01 2020 +0000
tree 5bc4199877820639ca29c4ac93c8a7c1e5605f61
parent b91132c6fcead50147c3af10cb89245523c289d7
parent 1ef721380ab9964721c23267c37de3328804cb06

Merge "Grant shell REBOOT permission"

data/etc/privapp-permissions-platform.xml

diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index b9047e4..692af58 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -372,6 +372,7 @@
         <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">

packages/Shell/AndroidManifest.xml

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 3c511dd..6a89b71 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" />