From c8c4c5d33d57c2bda168de96777497e9b313f3f2 Mon Sep 17 00:00:00 2001 From: Salvador Martinez Date: Mon, 11 Mar 2019 11:11:37 -0700 Subject: [PATCH] Rename setPowerSaverMode to setPowerSaverModeEnabled This will make it consistent with the boolean input Test: phone boots, tests pass Bug: 117154042 Change-Id: I30356413eafb90a93f10092ef4b0eeebe7ff7575 --- api/system-current.txt | 2 +- api/test-current.txt | 2 +- core/java/android/os/IPowerManager.aidl | 2 +- core/java/android/os/PowerManager.java | 4 ++-- .../settingslib/fuelgauge/BatterySaverUtils.java | 2 +- .../fuelgauge/BatterySaverUtilsTest.java | 14 +++++++------- .../android/server/power/PowerManagerService.java | 2 +- .../server/power/PowerManagerShellCommand.java | 2 +- .../batterysaver/BatterySaverStateMachine.java | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 96c9c7526fd28..bd726d5eb0b04 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5451,7 +5451,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 diff --git a/api/test-current.txt b/api/test-current.txt index 29137438384eb..07e75ea49153b 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 } diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl index 483c41a8e48a0..a0d88ee2c9820 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/core/java/android/os/IPowerManager.aidl @@ -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); diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index 728b215a75cb0..fdc5157ca5bb6 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -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(); } diff --git a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatterySaverUtils.java b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatterySaverUtils.java index c8c05a0f0bb67..b34f445d91f5c 100644 --- a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatterySaverUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatterySaverUtils.java @@ -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; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/BatterySaverUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/BatterySaverUtilsTest.java index 2988905b44a63..2bb3c2af83042 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/BatterySaverUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/BatterySaverUtilsTest.java @@ -60,7 +60,7 @@ public class BatterySaverUtilsTest { when(mMockContext.getContentResolver()).thenReturn(mMockResolver); when(mMockContext.getSystemService(eq(PowerManager.class))).thenReturn(mMockPowerManager); - when(mMockPowerManager.setPowerSaveMode(anyBoolean())).thenReturn(true); + when(mMockPowerManager.setPowerSaveModeEnabled(anyBoolean())).thenReturn(true); } @Test @@ -71,7 +71,7 @@ public class BatterySaverUtilsTest { assertThat(BatterySaverUtils.setPowerSaveMode(mMockContext, true, true)).isFalse(); verify(mMockContext, times(1)).sendBroadcast(any(Intent.class)); - verify(mMockPowerManager, times(0)).setPowerSaveMode(anyBoolean()); + verify(mMockPowerManager, times(0)).setPowerSaveModeEnabled(anyBoolean()); // They shouldn't have changed. assertEquals(-1, @@ -88,7 +88,7 @@ public class BatterySaverUtilsTest { assertThat(BatterySaverUtils.setPowerSaveMode(mMockContext, true, true)).isTrue(); verify(mMockContext, times(0)).sendBroadcast(any(Intent.class)); - verify(mMockPowerManager, times(1)).setPowerSaveMode(eq(true)); + verify(mMockPowerManager, times(1)).setPowerSaveModeEnabled(eq(true)); assertEquals(1, Secure.getInt(mMockResolver, Secure.LOW_POWER_WARNING_ACKNOWLEDGED, -1)); assertEquals(1, Secure.getInt(mMockResolver, Secure.LOW_POWER_MANUAL_ACTIVATION_COUNT, -2)); @@ -102,7 +102,7 @@ public class BatterySaverUtilsTest { assertThat(BatterySaverUtils.setPowerSaveMode(mMockContext, true, true)).isTrue(); verify(mMockContext, times(0)).sendBroadcast(any(Intent.class)); - verify(mMockPowerManager, times(1)).setPowerSaveMode(eq(true)); + verify(mMockPowerManager, times(1)).setPowerSaveModeEnabled(eq(true)); assertEquals(1, Secure.getInt(mMockResolver, Secure.LOW_POWER_WARNING_ACKNOWLEDGED, -1)); assertEquals(2, Secure.getInt(mMockResolver, Secure.LOW_POWER_MANUAL_ACTIVATION_COUNT, -2)); @@ -116,7 +116,7 @@ public class BatterySaverUtilsTest { assertThat(BatterySaverUtils.setPowerSaveMode(mMockContext, true, false)).isTrue(); verify(mMockContext, times(0)).sendBroadcast(any(Intent.class)); - verify(mMockPowerManager, times(1)).setPowerSaveMode(eq(true)); + verify(mMockPowerManager, times(1)).setPowerSaveModeEnabled(eq(true)); assertEquals(1, Secure.getInt(mMockResolver, Secure.LOW_POWER_WARNING_ACKNOWLEDGED, -1)); assertEquals(1, Secure.getInt(mMockResolver, Secure.LOW_POWER_MANUAL_ACTIVATION_COUNT, -2)); @@ -131,7 +131,7 @@ public class BatterySaverUtilsTest { assertThat(BatterySaverUtils.setPowerSaveMode(mMockContext, false, false)).isTrue(); verify(mMockContext, times(0)).sendBroadcast(any(Intent.class)); - verify(mMockPowerManager, times(1)).setPowerSaveMode(eq(false)); + verify(mMockPowerManager, times(1)).setPowerSaveModeEnabled(eq(false)); assertEquals(-1, Secure.getInt(mMockResolver, Secure.LOW_POWER_WARNING_ACKNOWLEDGED, -1)); assertEquals(-2, @@ -147,7 +147,7 @@ public class BatterySaverUtilsTest { assertThat(BatterySaverUtils.setPowerSaveMode(mMockContext, false, true)).isTrue(); verify(mMockContext, times(0)).sendBroadcast(any(Intent.class)); - verify(mMockPowerManager, times(1)).setPowerSaveMode(eq(false)); + verify(mMockPowerManager, times(1)).setPowerSaveModeEnabled(eq(false)); assertEquals(-1, Secure.getInt(mMockResolver, Secure.LOW_POWER_WARNING_ACKNOWLEDGED, -1)); assertEquals(-2, diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index bb23bc0e2414a..9b427f5cfd5cc 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -4474,7 +4474,7 @@ public final class PowerManagerService extends SystemService } @Override // Binder call - public boolean setPowerSaveMode(boolean enabled) { + public boolean setPowerSaveModeEnabled(boolean enabled) { if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.POWER_SAVER) != PackageManager.PERMISSION_GRANTED) { mContext.enforceCallingOrSelfPermission( diff --git a/services/core/java/com/android/server/power/PowerManagerShellCommand.java b/services/core/java/com/android/server/power/PowerManagerShellCommand.java index 18b8f0e403d95..edaa6d9775861 100644 --- a/services/core/java/com/android/server/power/PowerManagerShellCommand.java +++ b/services/core/java/com/android/server/power/PowerManagerShellCommand.java @@ -68,7 +68,7 @@ class PowerManagerShellCommand extends ShellCommand { pw.println("Error: " + ex.toString()); return -1; } - mInterface.setPowerSaveMode(mode == LOW_POWER_MODE_ON); + mInterface.setPowerSaveModeEnabled(mode == LOW_POWER_MODE_ON); return 0; } diff --git a/services/core/java/com/android/server/power/batterysaver/BatterySaverStateMachine.java b/services/core/java/com/android/server/power/batterysaver/BatterySaverStateMachine.java index af78995b6faa0..af5d40bfbcec4 100644 --- a/services/core/java/com/android/server/power/batterysaver/BatterySaverStateMachine.java +++ b/services/core/java/com/android/server/power/batterysaver/BatterySaverStateMachine.java @@ -524,7 +524,7 @@ public class BatterySaverStateMachine { /** * {@link com.android.server.power.PowerManagerService} calls it when - * {@link android.os.PowerManager#setPowerSaveMode} is called. + * {@link android.os.PowerManager#setPowerSaveModeEnabled} is called. * * Note this could? be called before {@link #onBootCompleted} too. */