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

Commit d84ddb0c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename setPowerSaverMode to setPowerSaverModeEnabled"

parents bc996c3c c8c4c5d3

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5449,7 +5449,7 @@ package android.os { 
    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(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.POWER_SAVER}) public boolean setPowerSaveMode(boolean);

    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

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1762,7 +1762,7 @@ 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(anyOf={"android.permission.DEVICE_POWER", "android.permission.POWER_SAVER"}) public boolean setPowerSaveMode(boolean);

    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

  }

core/java/android/os/IPowerManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ interface IPowerManager 
    boolean isInteractive();

    boolean isPowerSaveMode();

    PowerSaveState getPowerSaveState(int serviceType);

    boolean setPowerSaveMode(boolean mode);

    boolean setPowerSaveModeEnabled(boolean mode);

    boolean setDynamicPowerSavings(boolean dynamicPowerSavingsEnabled, int disableThreshold);

    boolean setAdaptivePowerSavePolicy(in BatterySaverPolicyConfig config);

    boolean setAdaptivePowerSaveEnabled(boolean enabled);

core/java/android/os/PowerManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1419,9 +1419,9 @@ public final class PowerManager { 
            android.Manifest.permission.DEVICE_POWER,

            android.Manifest.permission.POWER_SAVER

    })

    public boolean setPowerSaveMode(boolean mode) {

    public boolean setPowerSaveModeEnabled(boolean mode) {

        try {

            return mService.setPowerSaveMode(mode);

            return mService.setPowerSaveModeEnabled(mode);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatterySaverUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public class BatterySaverUtils { 
            setBatterySaverConfirmationAcknowledged(context);

        }



        if (context.getSystemService(PowerManager.class).setPowerSaveMode(enable)) {

        if (context.getSystemService(PowerManager.class).setPowerSaveModeEnabled(enable)) {

            if (enable) {

                final int count =

                        Secure.getInt(cr, Secure.LOW_POWER_MANUAL_ACTIVATION_COUNT, 0) + 1;