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

Merge "Update battery saver haptics mode" into udc-d1-dev am: 9dcfdf8e68

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23631877

Change-Id: I0feeef1bf779b4123a50142e59cae410c1186212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wesley Wang
2023-06-12 08:17:05 +00:00
committed by Automerger Merge Worker
parent 395a8f7ce8 9dcfdf8e68
commit e9e08812d4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,7 +171,7 @@ public class BatterySaverPolicy extends ContentObserver implements
true, /* disableAod */ true, /* disableAod */
true, /* disableLaunchBoost */ true, /* disableLaunchBoost */
true, /* disableOptionalSensors */ true, /* disableOptionalSensors */
true, /* disableVibration */ false, /* disableVibration */
false, /* enableAdjustBrightness */ false, /* enableAdjustBrightness */
false, /* enableDataSaver */ false, /* enableDataSaver */
true, /* enableFirewall */ true, /* enableFirewall */

6
services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverPolicyTest.java
View File

@@ -52,7 +52,7 @@ public class BatterySaverPolicyTest extends AndroidTestCase {
private static final int SOUND_TRIGGER_MODE = 0; // SOUND_TRIGGER_MODE_ALL_ENABLED private static final int SOUND_TRIGGER_MODE = 0; // SOUND_TRIGGER_MODE_ALL_ENABLED
private static final int DEFAULT_SOUND_TRIGGER_MODE = private static final int DEFAULT_SOUND_TRIGGER_MODE =
PowerManager.SOUND_TRIGGER_MODE_CRITICAL_ONLY; PowerManager.SOUND_TRIGGER_MODE_CRITICAL_ONLY;
private static final String BATTERY_SAVER_CONSTANTS = "disable_vibration=true," private static final String BATTERY_SAVER_CONSTANTS = "disable_vibration=false,"
+ "advertise_is_enabled=true," + "advertise_is_enabled=true,"
+ "disable_animation=false," + "disable_animation=false,"
+ "enable_firewall=true," + "enable_firewall=true,"
@@ -117,7 +117,7 @@ public class BatterySaverPolicyTest extends AndroidTestCase {
@SmallTest @SmallTest
public void testGetBatterySaverPolicy_PolicyVibration_DefaultValueCorrect() { public void testGetBatterySaverPolicy_PolicyVibration_DefaultValueCorrect() {
testServiceDefaultValue_On(ServiceType.VIBRATION); testServiceDefaultValue_Off(ServiceType.VIBRATION);
} }
@SmallTest @SmallTest
@@ -211,7 +211,7 @@ public class BatterySaverPolicyTest extends AndroidTestCase {
private void verifyBatterySaverConstantsUpdated() { private void verifyBatterySaverConstantsUpdated() {
final PowerSaveState vibrationState = final PowerSaveState vibrationState =
mBatterySaverPolicy.getBatterySaverPolicy(ServiceType.VIBRATION); mBatterySaverPolicy.getBatterySaverPolicy(ServiceType.VIBRATION);
assertThat(vibrationState.batterySaverEnabled).isTrue(); assertThat(vibrationState.batterySaverEnabled).isFalse();
final PowerSaveState animationState = final PowerSaveState animationState =
mBatterySaverPolicy.getBatterySaverPolicy(ServiceType.ANIMATION); mBatterySaverPolicy.getBatterySaverPolicy(ServiceType.ANIMATION);