From 7ea9d158532cfe204d913c9738feb87f8827b477 Mon Sep 17 00:00:00 2001
From: YK Hung <ykhung@google.com>
Date: Mon, 7 Oct 2024 23:46:43 +0000
Subject: [PATCH] Fix the NPE in the tryToFetchUsageData() method

Test: atest
Bug: 371490669
Fix: 371490669
Flag: EXEMPT for simple fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:291e92d6493b9640bc87bc787b58daa0936bae8e)
Merged-In: I4167becf373a6279135261bbaff44ef0888728fa
Change-Id: I4167becf373a6279135261bbaff44ef0888728fa
---
 .../fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java
index f710c71c969..5c250ab06a6 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java
@@ -106,6 +106,10 @@ public final class BatteryUsageBroadcastReceiver extends BroadcastReceiver {
 
     private void tryToFetchUsageData(Context context) {
         final Intent batteryIntent = BatteryUtils.getBatteryIntent(context);
+        if (batteryIntent == null) {
+            Log.w(TAG, "tryToFetchUsageData: ignore from null battery intent");
+            return;
+        }
         // Returns when battery is not fully charged.
         if (!BatteryStatus.isCharged(batteryIntent)) {
             return;