commit 291e92d6493b9640bc87bc787b58daa0936bae8e
author YK Hung <ykhung@google.com> Mon Oct 07 23:46:43 2024 +0000
committer YK Hung <ykhung@google.com> Mon Oct 07 23:46:43 2024 +0000
tree d9685b01e47d990be61734559e863c990258c487
parent efd16c7df9b4272b5f0dafbd2dfa3f4ae4a9b6b1

Fix the NPE in the tryToFetchUsageData() method

Test: atest
Bug: 371490669
Fix: 371490669
Flag: EXEMPT for simple fix
Change-Id: I4167becf373a6279135261bbaff44ef0888728fa

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

diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java
index f710c71..5c250ab 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java
@@ -106,6 +106,10 @@
 
     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;