From e8f2631f25a96af3b792ed75b8ba848459f652bb Mon Sep 17 00:00:00 2001
From: Zaiyue Xue <xuezaiyue@google.com>
Date: Thu, 12 Jan 2023 12:08:22 +0800
Subject: [PATCH] Fix b/264582296: Incorrect app battery usage after switching
 between 'restricted/unrestricted/optimized'.

This bug is due to the instance fields state is not refreshed after setAppUsageState(). When setting back to the original mode in the same page, getAppOptimizationMode(mMode, mAllowListed) still returns the original mode. So the setting back action is ignored.

Bug: 264582296
Fix: 264582296
Test: manual
Change-Id: I4da5dd7f1ca2660661f842a67b7d799aabd1ba05
---
 src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java b/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
index ccc88925274..08a532879af 100644
--- a/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
@@ -118,7 +118,7 @@ public class BatteryOptimizeUtils {
 
     /** Sets the {@link OptimizationMode} for associated app. */
     public void setAppUsageState(@OptimizationMode int mode, Action action) {
-        if (getAppOptimizationMode(mMode, mAllowListed) == mode) {
+        if (getAppOptimizationMode() == mode) {
             Log.w(TAG, "set the same optimization mode for: " + mPackageName);
             return;
         }