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

Commit 13bfe4a7 authored by Salvador Martinez's avatar Salvador Martinez Committed by Android (Google) Code Review
Browse files

Merge "Update names of dynamic power saver mode APIs"

parents 8cbcfdae b85a9f8d

api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -5424,14 +5424,14 @@ package android.os { 
  public final class PowerManager {

    method @RequiresPermission(allOf={android.Manifest.permission.READ_DREAM_STATE, android.Manifest.permission.WRITE_DREAM_STATE}) public void dream(long);

    method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public boolean forceSuspend();

    method @RequiresPermission(android.Manifest.permission.POWER_SAVER) public int getPowerSaveMode();

    method @RequiresPermission(android.Manifest.permission.POWER_SAVER) public int getPowerSaveModeTrigger();

    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(android.Manifest.permission.POWER_SAVER) public boolean setDynamicPowerSavings(boolean, int);

    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 setPowerSaveModeEnabled(boolean);

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

    field public static final int POWER_SAVER_MODE_DYNAMIC = 1; // 0x1

    field public static final int POWER_SAVER_MODE_PERCENTAGE = 0; // 0x0

    field public static final int POWER_SAVE_MODE_TRIGGER_DYNAMIC = 1; // 0x1

    field public static final int POWER_SAVE_MODE_TRIGGER_PERCENTAGE = 0; // 0x0

    field public static final int USER_ACTIVITY_EVENT_ACCESSIBILITY = 3; // 0x3

    field public static final int USER_ACTIVITY_EVENT_BUTTON = 1; // 0x1

    field public static final int USER_ACTIVITY_EVENT_OTHER = 0; // 0x0

api/test-current.txt

+5 −5
Original line number Diff line number Diff line
@@ -1803,11 +1803,11 @@ package android.os { 
  }



  public final class PowerManager {

    method @RequiresPermission("android.permission.POWER_SAVER") public int getPowerSaveMode();

    method @RequiresPermission("android.permission.POWER_SAVER") public boolean setDynamicPowerSavings(boolean, int);

    method @RequiresPermission("android.permission.POWER_SAVER") public int getPowerSaveModeTrigger();

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

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

    field public static final int POWER_SAVER_MODE_DYNAMIC = 1; // 0x1

    field public static final int POWER_SAVER_MODE_PERCENTAGE = 0; // 0x0

    field public static final int POWER_SAVE_MODE_TRIGGER_DYNAMIC = 1; // 0x1

    field public static final int POWER_SAVE_MODE_TRIGGER_PERCENTAGE = 0; // 0x0

  }



  public class Process {
@@ -2155,7 +2155,7 @@ package android.provider { 


  public static final class Settings.Global extends android.provider.Settings.NameValueTable {

    field public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages";

    field public static final String AUTOMATIC_POWER_SAVER_MODE = "automatic_power_saver_mode";

    field public static final String AUTOMATIC_POWER_SAVE_MODE = "automatic_power_save_mode";

    field public static final String BATTERY_SAVER_CONSTANTS = "battery_saver_constants";

    field public static final String CAPTIVE_PORTAL_FALLBACK_PROBE_SPECS = "captive_portal_fallback_probe_specs";

    field public static final String CAPTIVE_PORTAL_FALLBACK_URL = "captive_portal_fallback_url";

core/java/android/os/IPowerManager.aidl

+2 −2
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ interface IPowerManager 
    boolean isPowerSaveMode();

    PowerSaveState getPowerSaveState(int serviceType);

    boolean setPowerSaveModeEnabled(boolean mode);

    boolean setDynamicPowerSavings(boolean dynamicPowerSavingsEnabled, int disableThreshold);

    boolean setDynamicPowerSaveHint(boolean powerSaveHint, int disableThreshold);

    boolean setAdaptivePowerSavePolicy(in BatterySaverPolicyConfig config);

    boolean setAdaptivePowerSaveEnabled(boolean enabled);

    int getPowerSaveMode();

    int getPowerSaveModeTrigger();

    boolean isDeviceIdleMode();

    boolean isLightDeviceIdleMode();

core/java/android/os/PowerManager.java

+17 −18
Original line number Diff line number Diff line
@@ -1460,7 +1460,7 @@ public final class PowerManager { 
     * an on/off switch for a subset of features.

     * @hide

     *

     * @param dynamicPowerSavingsEnabled A signal indicating to the system if it believes the

     * @param powerSaveHint A signal indicating to the system if it believes the

     * dynamic power savings behaviors should be activated.

     * @param disableThreshold When the suggesting app believes it would be safe to disable dynamic

     * power savings behaviors.
@@ -1471,10 +1471,9 @@ public final class PowerManager { 
    @SystemApi

    @TestApi

    @RequiresPermission(permission.POWER_SAVER)

    public boolean setDynamicPowerSavings(boolean dynamicPowerSavingsEnabled,

            int disableThreshold) {

    public boolean setDynamicPowerSaveHint(boolean powerSaveHint, int disableThreshold) {

        try {

            return mService.setDynamicPowerSavings(dynamicPowerSavingsEnabled, disableThreshold);

            return mService.setDynamicPowerSaveHint(powerSaveHint, disableThreshold);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1525,54 +1524,54 @@ public final class PowerManager { 
    /**

     * Indicates automatic battery saver toggling by the system will be based on percentage.

     *

     * @see PowerManager#getPowerSaveMode()

     * @see PowerManager#getPowerSaveModeTrigger()

     *

     *  @hide

     */

    @SystemApi

    @TestApi

    public static final int POWER_SAVER_MODE_PERCENTAGE = 0;

    public static final int POWER_SAVE_MODE_TRIGGER_PERCENTAGE = 0;



    /**

     * Indicates automatic battery saver toggling by the system will be based on the state

     * of the dynamic power savings signal.

     *

     * @see PowerManager#setDynamicPowerSavings(boolean, int)

     * @see PowerManager#getPowerSaveMode()

     * @see PowerManager#setDynamicPowerSaveHint(boolean, int)

     * @see PowerManager#getPowerSaveModeTrigger()

     *

     *  @hide

     */

    @SystemApi

    @TestApi

    public static final int POWER_SAVER_MODE_DYNAMIC = 1;

    public static final int POWER_SAVE_MODE_TRIGGER_DYNAMIC = 1;



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(value = {

        POWER_SAVER_MODE_PERCENTAGE,

        POWER_SAVER_MODE_DYNAMIC

        POWER_SAVE_MODE_TRIGGER_PERCENTAGE,

        POWER_SAVE_MODE_TRIGGER_DYNAMIC



    })

    public @interface AutoPowerSaverMode{}

    public @interface AutoPowerSaveModeTriggers {}





    /**

     * Returns the current battery saver control mode. Values it may return are defined in

     * AutoPowerSaverMode. Note that this is a global device state, not a per user setting.

     * AutoPowerSaveModeTriggers. Note that this is a global device state, not a per user setting.

     *

     * @return The current value power saver mode for the system.

     *

     * @see AutoPowerSaverMode

     * @see PowerManager#getPowerSaveMode()

     * @see AutoPowerSaveModeTriggers

     * @see PowerManager#getPowerSaveModeTrigger()

     * @hide

     */

    @AutoPowerSaverMode

    @AutoPowerSaveModeTriggers

    @SystemApi

    @TestApi

    @RequiresPermission(android.Manifest.permission.POWER_SAVER)

    public int getPowerSaveMode() {

    public int getPowerSaveModeTrigger() {

        try {

            return mService.getPowerSaveMode();

            return mService.getPowerSaveModeTrigger();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

core/java/android/provider/Settings.java

+12 −12
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ import android.os.Bundle; 
import android.os.DropBoxManager;

import android.os.IBinder;

import android.os.LocaleList;

import android.os.PowerManager.AutoPowerSaveModeTriggers;

import android.os.Process;

import android.os.RemoteException;

import android.os.ResultReceiver;
@@ -12599,12 +12600,11 @@ public final class Settings { 
        /**

         * Battery level [1-100] at which low power mode automatically turns on.

         * If 0, it will not automatically turn on. For Q and newer, it will only automatically

         * turn on if the value is greater than 0 and the {@link #AUTOMATIC_POWER_SAVER_MODE}

         * turn on if the value is greater than 0 and the {@link #AUTOMATIC_POWER_SAVE_MODE}

         * setting is also set to

         * {@link android.os.PowerManager.AutoPowerSaverMode#POWER_SAVER_MODE_PERCENTAGE}.

         *

         * @see #AUTOMATIC_POWER_SAVER_MODE

         * @see android.os.PowerManager#getPowerSaveMode()

         * {@link android.os.PowerManager.AutoPowerSaveMode#POWER_SAVE_MODE_TRIGGER_PERCENTAGE}.

         * @see #AUTOMATIC_POWER_SAVE_MODE

         * @see android.os.PowerManager#getPowerSaveModeTrigger()

         * @hide

         */

        public static final String LOW_POWER_MODE_TRIGGER_LEVEL = "low_power_trigger_level";
@@ -12614,22 +12614,22 @@ public final class Settings { 














        /**















         * Whether battery saver is currently set to trigger based on percentage, dynamic power













         * savings trigger, or none. See {@link android.os.PowerManager.AutoPowerSaverMode} for













         * savings trigger, or none. See {@link AutoPowerSaveModeTriggers} for















         * accepted values.















         *















         *  @hide















         */















        @TestApi













        public static final String AUTOMATIC_POWER_SAVER_MODE = "automatic_power_saver_mode";













        public static final String AUTOMATIC_POWER_SAVE_MODE = "automatic_power_save_mode";



























        private static final Validator AUTOMATIC_POWER_SAVER_MODE_VALIDATOR =













        private static final Validator AUTOMATIC_POWER_SAVE_MODE_VALIDATOR =















                new SettingsValidators.DiscreteValueValidator(new String[] {"0", "1"});





























        /**















         * The setting that backs the disable threshold for the setPowerSavingsWarning api in















         * PowerManager















         *













         * @see android.os.PowerManager#setDynamicPowerSavings(boolean, int)













         * @see android.os.PowerManager#setDynamicPowerSaveHint(boolean, int)















         * @hide















         */















        @TestApi









@@ -12639,9 +12639,9 @@ public final class Settings {













                new SettingsValidators.InclusiveIntegerRangeValidator(0, 100);





























        /**













         * The setting which backs the setDynamicPowerSavings api in PowerManager.













         * The setting which backs the setDynamicPowerSaveHint api in PowerManager.















         *













         * @see android.os.PowerManager#setDynamicPowerSavings(boolean, int)













         * @see android.os.PowerManager#setDynamicPowerSaveHint(boolean, int)















         * @hide















         */















        @TestApi










@@ -13630,7 +13630,7 @@ public final class Settings {













            VALIDATORS.put(LOW_POWER_MODE_TRIGGER_LEVEL, LOW_POWER_MODE_TRIGGER_LEVEL_VALIDATOR);















            VALIDATORS.put(LOW_POWER_MODE_TRIGGER_LEVEL_MAX,















                    LOW_POWER_MODE_TRIGGER_LEVEL_VALIDATOR);













            VALIDATORS.put(AUTOMATIC_POWER_SAVER_MODE, AUTOMATIC_POWER_SAVER_MODE_VALIDATOR);













            VALIDATORS.put(AUTOMATIC_POWER_SAVE_MODE, AUTOMATIC_POWER_SAVE_MODE_VALIDATOR);















            VALIDATORS.put(DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD,















                    DYNAMIC_POWER_SAVINGS_VALIDATOR);















            VALIDATORS.put(BLUETOOTH_ON, BLUETOOTH_ON_VALIDATOR);