commit b1669bf22bb8d1fc72633c713e7c6236e55c19d8
author Chris Tate <ctate@android.com> Wed Mar 22 18:07:43 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 22 18:07:49 2017 +0000
tree 2bb074fa1984317a3bf36d63a10ca5dd8ea61e5c
parent c344373ed49c768f3b1cc8486c6ab376e5ef5256
parent ec3a9f3346d672e916e83eb2c9c827593d8412c1

Merge "Give shell the CHANGE_DEVICE_IDLE_TEMP_WHITELIST permission"

data/etc/privapp-permissions-platform.xml

diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 8a8d027..bc1d88b 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -254,6 +254,7 @@
         <permission name="android.permission.BIND_APPWIDGET"/>
         <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
         <permission name="android.permission.CHANGE_CONFIGURATION"/>
+        <permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST" />
         <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
         <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
         <permission name="android.permission.DELETE_CACHE_FILES"/>

packages/Shell/AndroidManifest.xml

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 3cce299..6bfab78 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -103,6 +103,7 @@
     <uses-permission android:name="android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS"/>
     <uses-permission android:name="android.permission.INSTALL_GRANT_RUNTIME_PERMISSIONS" />
     <uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST" />
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
     <uses-permission android:name="android.permission.MOUNT_FORMAT_FILESYSTEMS" />
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />

services/core/java/com/android/server/DeviceIdleController.java

diff --git a/services/core/java/com/android/server/DeviceIdleController.java b/services/core/java/com/android/server/DeviceIdleController.java
index 3e2dae5..26b15d8 100644
--- a/services/core/java/com/android/server/DeviceIdleController.java
+++ b/services/core/java/com/android/server/DeviceIdleController.java
@@ -2865,8 +2865,9 @@
             if (arg != null) {
                 try {
                     addPowerSaveTempWhitelistAppChecked(arg, duration, shell.userId, "shell");
-                } catch (RemoteException re) {
-                    pw.println("Failed: " + re);
+                } catch (Exception e) {
+                    pw.println("Failed: " + e);
+                    return -1;
                 }
             } else {
                 dumpTempWhitelistSchedule(pw, false);