Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename setPowerSaverMode to setPowerSaverModeEnabled"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-15 16:15:41 +00:00
committed by Android (Google) Code Review
parent bc996c3cd1 c8c4c5d33d
commit d84ddb0c4f
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -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

2
api/test-current.txt
View File

@@ -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
}

2
core/java/android/os/IPowerManager.aidl
View File

@@ -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);

4
core/java/android/os/PowerManager.java
View File

@@ -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();
}

2
packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatterySaverUtils.java
View File

@@ -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;

14
packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/BatterySaverUtilsTest.java
View File

@@ -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,

2
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -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(

2
services/core/java/com/android/server/power/PowerManagerShellCommand.java
View File

@@ -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;
}

2
services/core/java/com/android/server/power/batterysaver/BatterySaverStateMachine.java
View File

@@ -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.
*/