From a2f5c5a24e73e47c75df155edd58188d1b908be7 Mon Sep 17 00:00:00 2001
From: ykhung <ykhung@google.com>
Date: Mon, 14 Nov 2022 11:24:17 +0800
Subject: [PATCH] Remove the 'schedule by routine' from the saver scheduler

Fix: 258603978
Test: make RunSettingsRoboTests
Change-Id: I6256957dc5a4be6699998c825fb32e03f638af39
---
 .../fuelgauge/BatterySettingsMigrateChecker.java   |  3 +++
 ...BatterySaverScheduleRadioButtonsController.java |  4 +++-
 .../batterysaver/BatterySaverScheduleSettings.java | 14 +-------------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/BatterySettingsMigrateChecker.java b/src/com/android/settings/fuelgauge/BatterySettingsMigrateChecker.java
index a24060da790..c54e6d8c503 100644
--- a/src/com/android/settings/fuelgauge/BatterySettingsMigrateChecker.java
+++ b/src/com/android/settings/fuelgauge/BatterySettingsMigrateChecker.java
@@ -24,6 +24,7 @@ import android.provider.Settings;
 import android.util.Log;
 
 import com.android.settings.fuelgauge.batterysaver.BatterySaverScheduleRadioButtonsController;
+import com.android.settingslib.fuelgauge.BatterySaverUtils;
 
 /** Execute battery settings migration tasks in the device booting stage. */
 public final class BatterySettingsMigrateChecker extends BroadcastReceiver {
@@ -52,5 +53,7 @@ public final class BatterySettingsMigrateChecker extends BroadcastReceiver {
                     BatterySaverScheduleRadioButtonsController.TRIGGER_LEVEL_MIN);
             Log.w(TAG, "Reset invalid scheduled battery level from: " + threshold);
         }
+        // Force removing the 'schedule by routine' state.
+        BatterySaverUtils.revertScheduleToNoneIfNeeded(context);
     }
 }
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleRadioButtonsController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleRadioButtonsController.java
index 378918a50eb..7b17dcb7d39 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleRadioButtonsController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleRadioButtonsController.java
@@ -117,7 +117,9 @@ public class BatterySaverScheduleRadioButtonsController {
         if (mode == PowerManager.POWER_SAVE_MODE_TRIGGER_DYNAMIC || triggerLevel != 0) {
             BatterySaverUtils.suppressAutoBatterySaver(mContext);
         }
-        mSeekBarController.updateSeekBar();
+        if (mSeekBarController != null) {
+            mSeekBarController.updateSeekBar();
+        }
         return true;
     }
 }
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java
index 0c596bbc951..738229937db 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java
@@ -122,24 +122,12 @@ public class BatterySaverScheduleSettings extends RadioButtonPickerFragment {
     protected List<? extends CandidateInfo> getCandidates() {
         Context context = getContext();
         List<CandidateInfo> candidates = Lists.newArrayList();
-        String routineProviderApp = getContext().getResources()
-                .getString(com.android.internal.R.string.config_batterySaverScheduleProvider);
         candidates.add(new BatterySaverScheduleCandidateInfo(
                 context.getText(R.string.battery_saver_auto_no_schedule),
                 /* summary */ null,
                 BatterySaverScheduleRadioButtonsController.KEY_NO_SCHEDULE,
                 /* enabled */ true));
-        // only add routine option if an app has been specified
-        if (!TextUtils.isEmpty(routineProviderApp)) {
-            candidates.add(new BatterySaverScheduleCandidateInfo(
-                    context.getText(R.string.battery_saver_auto_routine),
-                    context.getText(R.string.battery_saver_auto_routine_summary),
-                    BatterySaverScheduleRadioButtonsController.KEY_ROUTINE,
-                    /* enabled */ true));
-        } else {
-            // Make sure routine is not selected if no provider app is configured
-            BatterySaverUtils.revertScheduleToNoneIfNeeded(context);
-        }
+        BatterySaverUtils.revertScheduleToNoneIfNeeded(context);
         candidates.add(new BatterySaverScheduleCandidateInfo(
                 context.getText(R.string.battery_saver_auto_percentage),
                 /* summary */ null,