commit baa3f3a3c642eb3b0b937a44b82a5f16e826da28
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Aug 30 06:22:53 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 30 06:22:53 2022 +0000
tree f7c91cb7759831838333e748378f76656ee65710
parent 226107f1d68845368704ae6424014ba3ddcee622
parent 457aaffa502d5850d4a6c5e5a1fba36f4f6b3c8f

Merge "Support showing battery level chart first immediately after the battery level data is ready." into tm-qpr-dev

src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java

diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
index f3fec8e..6d2c1a1 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
@@ -369,10 +369,6 @@
             addFooterPreferenceIfNeeded(false);
             return false;
         }
-        if (mBatteryUsageMap == null) {
-            // Battery usage data is not ready, wait for data ready to refresh UI.
-            return false;
-        }
 
         if (isBatteryLevelDataInOneDay()) {
             // Only 1 day data, hide the daily chart view.
@@ -394,6 +390,10 @@
             mHourlyChartView.setViewModel(hourlyViewModel);
         }
 
+        if (mBatteryUsageMap == null) {
+            // Battery usage data is not ready, wait for data ready to refresh UI.
+            return false;
+        }
         mHandler.post(() -> {
             final long start = System.currentTimeMillis();
             removeAndCacheAllPrefs();