From 7627a0e575fd3822f3b58de5dd4fa7902bf441cc Mon Sep 17 00:00:00 2001
From: Zaiyue Xue <xuezaiyue@google.com>
Date: Fri, 13 Jan 2023 20:32:04 +0800
Subject: [PATCH] Fix b/265409044: The battery usage page auto goes up when
 coming back from app details page.

screen record after fix: https://drive.google.com/file/d/1a2vvMIYLSalXfM8-004drKBWK2LcK_F9/view?resourcekey=0-A586Sk0yx-OnErHkd5EgjQ

Bug: 265409044
Fix: 265409044
Test: manual
Change-Id: I7a58c9081250936de27a4970d0a9708168138fb9
---
 .../batteryusage/BatteryUsageBreakdownController.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
index b95920e04b7..587fd6448f5 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
@@ -217,13 +217,16 @@ public class BatteryUsageBreakdownController extends BasePreferenceController
     }
 
     private void showSpinnerAndAppList() {
-        removeAndCacheAllPreferences();
         if (mBatteryDiffData == null) {
+            mHandler.post(() -> {
+                removeAndCacheAllPreferences();
+            });
             return;
         }
         mSpinnerPreference.setVisible(true);
         mAppListPreferenceGroup.setVisible(true);
         mHandler.post(() -> {
+            removeAndCacheAllPreferences();
             addAllPreferences();
         });
     }