From 2bf8a7817b50dabf10e072dced3c8c3f24ba57cc Mon Sep 17 00:00:00 2001
From: Dmitri Plotnikov <dplotnikov@google.com>
Date: Tue, 21 Mar 2023 18:25:25 -0700
Subject: [PATCH] Fix NPE when registering BatteryTrigger before first
 BATTERY_CHANGED broadcast

Bug: 274544025
Test: reboot the device while plugged in
Change-Id: Iebaebbc1266c5e3894bc9fb65bd1b2dd27ec31f3
---
 .../java/com/android/server/powerstats/BatteryTrigger.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/powerstats/BatteryTrigger.java b/services/core/java/com/android/server/powerstats/BatteryTrigger.java
index b35cb52d50255..15c181198fae4 100644
--- a/services/core/java/com/android/server/powerstats/BatteryTrigger.java
+++ b/services/core/java/com/android/server/powerstats/BatteryTrigger.java
@@ -59,7 +59,9 @@ public final class BatteryTrigger extends PowerStatsLogTrigger {
         if (triggerEnabled) {
             IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
             Intent batteryStatus = mContext.registerReceiver(mBatteryLevelReceiver, filter);
-            mBatteryLevel = batteryStatus.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
+            if (batteryStatus != null) {
+                mBatteryLevel = batteryStatus.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
+            }
         }
     }
 }