Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE when registering BatteryTrigger before first BATTERY_CHANGED broadcast

Browse Source 
Bug: 274544025
Test: reboot the device while plugged in
Change-Id: Iebaebbc1266c5e3894bc9fb65bd1b2dd27ec31f3
This commit is contained in:
Dmitri Plotnikov
2023-03-21 18:25:25 -07:00
parent e5e601c61b
commit 2bf8a7817b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/powerstats/BatteryTrigger.java
View File

@@ -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);
}
}
}
}