commit 2802ec1c4497dec627ad7a426fa54f368948e80a
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Aug 25 16:19:10 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 25 16:19:10 2022 +0000
tree 9c04ea66686cae47f38107df67d8f3d67dd4987c
parent 4d7259124cfc2bfe98a47167deae61f6a675c500
parent 8e00605228a891780aa0b9e365671a8261760c99

Merge "Fix b/243485315: NullPointerException when getAppBatteryUsageData()."

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 45ae8c5..f3fec8e 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
@@ -697,12 +697,13 @@
 
         final Map<Integer, Map<Integer, BatteryDiffData>> batteryUsageData =
                 DataProcessor.getBatteryUsageData(context, batteryHistoryMap);
-        return batteryUsageData == null
-                ? null
-                : batteryUsageData
-                        .get(BatteryChartViewModel.SELECTED_INDEX_ALL)
-                        .get(BatteryChartViewModel.SELECTED_INDEX_ALL)
-                        .getAppDiffEntryList();
+        if (batteryUsageData == null) {
+            return null;
+        }
+        BatteryDiffData allBatteryDiffData = batteryUsageData.get(
+                BatteryChartViewModel.SELECTED_INDEX_ALL).get(
+                BatteryChartViewModel.SELECTED_INDEX_ALL);
+        return allBatteryDiffData == null ? null : allBatteryDiffData.getAppDiffEntryList();
     }
 
     /** Used for {@link AppBatteryPreferenceController}. */