diff options
| author | 2017-03-22 18:07:43 +0000 | |
|---|---|---|
| committer | 2017-03-22 18:07:49 +0000 | |
| commit | b1669bf22bb8d1fc72633c713e7c6236e55c19d8 (patch) | |
| tree | 2bb074fa1984317a3bf36d63a10ca5dd8ea61e5c | |
| parent | c344373ed49c768f3b1cc8486c6ab376e5ef5256 (diff) | |
| parent | ec3a9f3346d672e916e83eb2c9c827593d8412c1 (diff) | |
Merge "Give shell the CHANGE_DEVICE_IDLE_TEMP_WHITELIST permission"
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 1 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/DeviceIdleController.java | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 8a8d0274ae56..bc1d88bee339 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -254,6 +254,7 @@ applications that come with the platform <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"/> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 3cce2993fc4a..6bfab78fcd62 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" /> diff --git a/services/core/java/com/android/server/DeviceIdleController.java b/services/core/java/com/android/server/DeviceIdleController.java index 3e2dae55988c..26b15d8ed4b1 100644 --- a/services/core/java/com/android/server/DeviceIdleController.java +++ b/services/core/java/com/android/server/DeviceIdleController.java @@ -2865,8 +2865,9 @@ public class DeviceIdleController extends SystemService 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); |