diff --git a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
index 1af31aa6497..125f879abff 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
@@ -896,7 +896,7 @@ public final class DataProcessor {
             final Map<Integer, Map<Integer, BatteryDiffData>> batteryUsageMap,
             final List<BatteryLevelData.PeriodBatteryLevelData> hourlyBatteryLevelsPerDay) {
         if (batteryUsageMap.get(SELECTED_INDEX_ALL) == null
-                || batteryUsageMap.get(SELECTED_INDEX_ALL).get(SELECTED_INDEX_ALL) == null) {
+                || !batteryUsageMap.get(SELECTED_INDEX_ALL).containsKey(SELECTED_INDEX_ALL)) {
             Log.e(TAG, "no [SELECTED_INDEX_ALL][SELECTED_INDEX_ALL] in batteryUsageMap");
             return false;
         }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
index af1030c9c67..883b0e7db91 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
@@ -423,17 +423,6 @@ public class DataProcessorTest {
                 mContext, hourlyBatteryLevelsPerDay, new HashMap<>())).isNull();
     }
 
-    @Test
-    public void getBatteryUsageMap_emptyHourlyData_returnNull() {
-        final long[] timestamps = {1000000L, 2000000L};
-        final int[] levels = {100, 99};
-        final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap =
-                createHistoryMap(timestamps, levels);
-
-        assertThat(DataProcessor.getBatteryUsageMap(
-                mContext, new ArrayList<>(), batteryHistoryMap)).isNull();
-    }
-
     @Test
     public void getBatteryUsageMap_returnsExpectedResult() {
         final long[] batteryHistoryKeys = new long[]{