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

Commit 5dfac222 authored by Robert Horvath's avatar Robert Horvath Committed by Android (Google) Code Review
Browse files

Merge changes from topics "low-power-standby-api", "lps-wakelock-testapi" 

* changes:
  Add API to configure LPS maintenance mode behavior
  Add TestApi to force Low Power Standby to be active
  Add TestApi wakelock flag to have system acquire wakelock
  Allowlist active voice interaction session from Low Power Standby
  Introduce Low Power Standby API and wakelock restrictions
parents d8d1b82e abb95aec

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -31681,6 +31681,7 @@ package android.os { 
    method public boolean isDeviceLightIdleMode();

    method public boolean isIgnoringBatteryOptimizations(String);

    method public boolean isInteractive();

    method public boolean isLowPowerStandbyEnabled();

    method public boolean isPowerSaveMode();

    method public boolean isRebootingUserspaceSupported();

    method @Deprecated public boolean isScreenOn();
@@ -31692,6 +31693,7 @@ package android.os { 
    field public static final int ACQUIRE_CAUSES_WAKEUP = 268435456; // 0x10000000

    field public static final String ACTION_DEVICE_IDLE_MODE_CHANGED = "android.os.action.DEVICE_IDLE_MODE_CHANGED";

    field public static final String ACTION_DEVICE_LIGHT_IDLE_MODE_CHANGED = "android.os.action.LIGHT_DEVICE_IDLE_MODE_CHANGED";

    field public static final String ACTION_LOW_POWER_STANDBY_ENABLED_CHANGED = "android.os.action.LOW_POWER_STANDBY_ENABLED_CHANGED";

    field public static final String ACTION_POWER_SAVE_MODE_CHANGED = "android.os.action.POWER_SAVE_MODE_CHANGED";

    field @Deprecated public static final int FULL_WAKE_LOCK = 26; // 0x1a

    field public static final int LOCATION_MODE_ALL_DISABLED_WHEN_SCREEN_OFF = 2; // 0x2

core/api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ package android { 
    field public static final String MANAGE_GAME_MODE = "android.permission.MANAGE_GAME_MODE";

    field public static final String MANAGE_HOTWORD_DETECTION = "android.permission.MANAGE_HOTWORD_DETECTION";

    field public static final String MANAGE_IPSEC_TUNNELS = "android.permission.MANAGE_IPSEC_TUNNELS";

    field public static final String MANAGE_LOW_POWER_STANDBY = "android.permission.MANAGE_LOW_POWER_STANDBY";

    field public static final String MANAGE_MUSIC_RECOGNITION = "android.permission.MANAGE_MUSIC_RECOGNITION";

    field public static final String MANAGE_NOTIFICATION_LISTENERS = "android.permission.MANAGE_NOTIFICATION_LISTENERS";

    field public static final String MANAGE_ONE_TIME_PERMISSION_SESSIONS = "android.permission.MANAGE_ONE_TIME_PERMISSION_SESSIONS";
@@ -9313,11 +9314,14 @@ package android.os { 
    method @RequiresPermission(android.Manifest.permission.READ_DREAM_STATE) public boolean isAmbientDisplayAvailable();

    method @RequiresPermission(android.Manifest.permission.READ_DREAM_STATE) public boolean isAmbientDisplaySuppressed();

    method @RequiresPermission(android.Manifest.permission.READ_DREAM_STATE) public boolean isAmbientDisplaySuppressedForToken(@NonNull String);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_LOW_POWER_STANDBY, android.Manifest.permission.DEVICE_POWER}) public boolean isLowPowerStandbySupported();

    method @RequiresPermission(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.POWER_SAVER}) public boolean setAdaptivePowerSaveEnabled(boolean);

    method @RequiresPermission(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.POWER_SAVER}) public boolean setAdaptivePowerSavePolicy(@NonNull android.os.BatterySaverPolicyConfig);

    method @RequiresPermission(anyOf={android.Manifest.permission.BATTERY_PREDICTION, android.Manifest.permission.DEVICE_POWER}) public void setBatteryDischargePrediction(@NonNull java.time.Duration, boolean);

    method @RequiresPermission(android.Manifest.permission.POWER_SAVER) public boolean setDynamicPowerSaveHint(boolean, int);

    method @RequiresPermission(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.POWER_SAVER}) public boolean setFullPowerSavePolicy(@NonNull android.os.BatterySaverPolicyConfig);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_LOW_POWER_STANDBY, android.Manifest.permission.DEVICE_POWER}) public void setLowPowerStandbyActiveDuringMaintenance(boolean);

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_LOW_POWER_STANDBY, android.Manifest.permission.DEVICE_POWER}) public void setLowPowerStandbyEnabled(boolean);

    method @RequiresPermission(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.POWER_SAVER}) public boolean setPowerSaveModeEnabled(boolean);

    method @RequiresPermission(android.Manifest.permission.WRITE_DREAM_STATE) public void suppressAmbientDisplay(@NonNull String, boolean);

    method @RequiresPermission(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.USER_ACTIVITY}) public void userActivity(long, int, int);

core/api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -1718,7 +1718,9 @@ package android.os { 
  }



  public final class PowerManager {

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_LOW_POWER_STANDBY, android.Manifest.permission.DEVICE_POWER}) public void forceLowPowerStandbyActive(boolean);

    field public static final String ACTION_ENHANCED_DISCHARGE_PREDICTION_CHANGED = "android.os.action.ENHANCED_DISCHARGE_PREDICTION_CHANGED";

    field @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public static final int SYSTEM_WAKELOCK = -2147483648; // 0x80000000

  }



  public class Process {

core/java/android/os/IPowerManager.aidl

+5 −0
Original line number Diff line number Diff line
@@ -65,6 +65,11 @@ interface IPowerManager 
    boolean isBatteryDischargePredictionPersonalized();

    boolean isDeviceIdleMode();

    boolean isLightDeviceIdleMode();

    boolean isLowPowerStandbySupported();

    boolean isLowPowerStandbyEnabled();

    void setLowPowerStandbyEnabled(boolean enabled);

    void setLowPowerStandbyActiveDuringMaintenance(boolean activeDuringMaintenance);

    void forceLowPowerStandbyActive(boolean active);



    @UnsupportedAppUsage

    void reboot(boolean confirm, String reason, boolean wait);

core/java/android/os/PowerManager.java

+120 −0
Original line number Diff line number Diff line
@@ -215,6 +215,17 @@ public final class PowerManager { 
     */

    public static final int UNIMPORTANT_FOR_LOGGING = 0x40000000;



    /**

     * Wake lock flag: This wake lock should be held by the system.

     *

     * <p>Meant to allow tests to keep the device awake even when power restrictions are active.

     *

     * @hide

     */

    @TestApi

    @RequiresPermission(android.Manifest.permission.DEVICE_POWER)

    public static final int SYSTEM_WAKELOCK = 0x80000000;



    /**

     * Flag for {@link WakeLock#release WakeLock.release(int)}: Defer releasing a

     * {@link #PROXIMITY_SCREEN_OFF_WAKE_LOCK} wake lock until the proximity sensor
@@ -2145,6 +2156,105 @@ public final class PowerManager { 
        return isDeviceLightIdleMode();

    }



    /**

     * Returns true if Low Power Standby is supported on this device.

     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(anyOf = {

            android.Manifest.permission.MANAGE_LOW_POWER_STANDBY,

            android.Manifest.permission.DEVICE_POWER

    })

    public boolean isLowPowerStandbySupported() {

        try {

            return mService.isLowPowerStandbySupported();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Returns true if Low Power Standby is enabled.

     *

     * <p>When Low Power Standby is enabled, apps (including apps running foreground services) are

     * subject to additional restrictions while the device is non-interactive, outside of device

     * idle maintenance windows: Their network access is disabled, and any wakelocks they hold are

     * ignored.

     *

     * <p>When Low Power Standby is enabled or disabled, a Intent with action

     * {@link #ACTION_LOW_POWER_STANDBY_ENABLED_CHANGED} is broadcast to registered receivers.

     */

    public boolean isLowPowerStandbyEnabled() {

        try {

            return mService.isLowPowerStandbyEnabled();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Set whether Low Power Standby is enabled.

     * Does nothing if Low Power Standby is not supported.

     *

     * @see #isLowPowerStandbySupported()

     * @see #isLowPowerStandbyEnabled()

     * @hide

     */

    @SystemApi

    @RequiresPermission(anyOf = {

            android.Manifest.permission.MANAGE_LOW_POWER_STANDBY,

            android.Manifest.permission.DEVICE_POWER

    })

    public void setLowPowerStandbyEnabled(boolean enabled) {

        try {

            mService.setLowPowerStandbyEnabled(enabled);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Set whether Low Power Standby should be active during doze maintenance mode.

     * Does nothing if Low Power Standby is not supported.

     *

     * @see #isLowPowerStandbySupported()

     * @see #isLowPowerStandbyEnabled()

     * @hide

     */

    @SystemApi

    @RequiresPermission(anyOf = {

            android.Manifest.permission.MANAGE_LOW_POWER_STANDBY,

            android.Manifest.permission.DEVICE_POWER

    })

    public void setLowPowerStandbyActiveDuringMaintenance(boolean activeDuringMaintenance) {

        try {

            mService.setLowPowerStandbyActiveDuringMaintenance(activeDuringMaintenance);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Force Low Power Standby restrictions to be active.

     * Does nothing if Low Power Standby is not supported.

     *

     * @see #isLowPowerStandbySupported()

     * @hide

     */

    @TestApi

    @RequiresPermission(anyOf = {

            android.Manifest.permission.MANAGE_LOW_POWER_STANDBY,

            android.Manifest.permission.DEVICE_POWER

    })

    public void forceLowPowerStandbyActive(boolean active) {

        try {

            mService.forceLowPowerStandbyActive(active);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Return whether the given application package name is on the device's power allowlist.

     * Apps can be placed on the allowlist through the settings UI invoked by
@@ -2630,6 +2740,16 @@ public final class PowerManager { 
    public static final String ACTION_POWER_SAVE_TEMP_WHITELIST_CHANGED

            = "android.os.action.POWER_SAVE_TEMP_WHITELIST_CHANGED";



    /**

     * Intent that is broadcast when Low Power Standby is enabled or disabled.

     * This broadcast is only sent to registered receivers.

     *

     * @see #isLowPowerStandbyEnabled()

     */

    @SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_LOW_POWER_STANDBY_ENABLED_CHANGED =

            "android.os.action.LOW_POWER_STANDBY_ENABLED_CHANGED";



    /**

     * Constant for PreIdleTimeout normal mode (default mode, not short nor extend timeout) .

     * @hide