Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1669bf2 authored by Chris Tate's avatar Chris Tate Committed by Android (Google) Code Review
Browse files

Merge "Give shell the CHANGE_DEVICE_IDLE_TEMP_WHITELIST permission"

parents c344373e ec3a9f33

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -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"/>

packages/Shell/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -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

+3 −2
Original line number Diff line number Diff line
@@ -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);