commit 250101cd8f83b1baf0a37f06a152c41b47868913
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Dec 18 14:30:37 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 18 14:30:37 2024 -0800
tree 00163ccaf317fdf3d54635216eeec56c954849c4
parent 18eac4ef277280e6812d6d784fe7fd6bfb4c2752
parent 7ea9d158532cfe204d913c9738feb87f8827b477

Merge "Fix the NPE in the tryToFetchUsageData() method" into main

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;