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

Merge "Give shell the CHANGE_DEVICE_IDLE_TEMP_WHITELIST permission"

Browse Source
This commit is contained in:
Chris Tate
2017-03-22 18:07:43 +00:00
committed by Android (Google) Code Review
parent c344373ed4 ec3a9f3346
commit b1669bf22b
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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"/>

1
packages/Shell/AndroidManifest.xml
View File

@@ -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" />

5
services/core/java/com/android/server/DeviceIdleController.java
View File

@@ -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);