From bf5dd80d4fa8e0cf95908bf76db6e8d949782255 Mon Sep 17 00:00:00 2001
From: ykhung <ykhung@google.com>
Date: Sat, 8 May 2021 01:15:21 +0800
Subject: [PATCH] Fix corner case IndexOutOfBound exception for null content

Bug: 184807417
Test: make SettingsRoboTests
Change-Id: Icf35b4084bcea62c2879a100d1b35b5448d8276d
---
 .../settings/fuelgauge/BatteryChartPreferenceController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java
index f4c9b0ce775..3af0163354c 100644
--- a/src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java
@@ -185,7 +185,7 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll
     private void setBatteryHistoryMapInner(
             final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap) {
         // Resets all battery history data relative variables.
-        if (batteryHistoryMap == null) {
+        if (batteryHistoryMap == null || batteryHistoryMap.isEmpty()) {
             mBatteryIndexedMap = null;
             mBatteryHistoryKeys = null;
             mBatteryHistoryLevels = null;