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

Remove batterySaverScheduleProvide checking from BatterySaverUtils

Browse Source 
Rset the save schedule mode into none directly if the current mode is
routine, since the 'schedule by routine' is removed from saver setting

Bug: 258603978
Test: make RunSettingsLibRoboTests -j40
Change-Id: I261737e5c0ae23ceac7bd4b1b8d45526a60b2899
This commit is contained in:
ykhung
2022-11-14 18:08:06 +08:00
parent 69cd512107
commit 2de8df0f9b
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SettingsLib/OWNERS
View File

@@ -7,6 +7,7 @@ juliacr@google.com
leifhendrik@google.com
tmfang@google.com
virgild@google.com
ykhung@google.com
# Exempt resource files (because they are in a flat directory and too hard to manage via OWNERS)
per-file *.xml=*

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

@@ -24,7 +24,6 @@ import android.os.PowerManager;
import android.os.UserHandle;
import android.provider.Settings.Global;
import android.provider.Settings.Secure;
import android.text.TextUtils;
import android.util.KeyValueListParser;
import android.util.Log;
import android.util.Slog;
@@ -221,17 +220,14 @@ public class BatterySaverUtils {
}
/**
* Reverts battery saver schedule mode to none if we are in a bad state where routine mode
* is selected but no app is configured to actually provide the signal.
* Reverts battery saver schedule mode to none if routine mode is selected.
* @param context a valid context
*/
public static void revertScheduleToNoneIfNeeded(Context context) {
ContentResolver resolver = context.getContentResolver();
final int currentMode = Global.getInt(resolver, Global.AUTOMATIC_POWER_SAVE_MODE,
PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
boolean providerConfigured = !TextUtils.isEmpty(context.getString(
com.android.internal.R.string.config_batterySaverScheduleProvider));
if (currentMode == PowerManager.POWER_SAVE_MODE_TRIGGER_DYNAMIC && !providerConfigured) {
if (currentMode == PowerManager.POWER_SAVE_MODE_TRIGGER_DYNAMIC) {
Global.putInt(resolver, Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
Global.putInt(resolver, Global.AUTOMATIC_POWER_SAVE_MODE,
PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);