From 2de8df0f9b6e0fdee1982e2d6e91132db3357395 Mon Sep 17 00:00:00 2001 From: ykhung Date: Mon, 14 Nov 2022 18:08:06 +0800 Subject: [PATCH] Remove batterySaverScheduleProvide checking from BatterySaverUtils 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 --- packages/SettingsLib/OWNERS | 1 + .../android/settingslib/fuelgauge/BatterySaverUtils.java | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/SettingsLib/OWNERS b/packages/SettingsLib/OWNERS index 8eafbdfdf6bcb..cb0ba4e80512f 100644 --- a/packages/SettingsLib/OWNERS +++ b/packages/SettingsLib/OWNERS @@ -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=* diff --git a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatterySaverUtils.java b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatterySaverUtils.java index 34da30555fb38..3e710e4c7e352 100644 --- a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatterySaverUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatterySaverUtils.java @@ -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);