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

Merge "Fix NPE when registering BatteryTrigger before first BATTERY_CHANGED broadcast" into udc-dev

Browse Source
This commit is contained in:
Dmitri Plotnikov
2023-03-22 17:03:22 +00:00
committed by Android (Google) Code Review
parent 5c3928ac91 2bf8a7817b
commit 7b45947867
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,9 @@ public final class BatteryTrigger extends PowerStatsLogTrigger {
if (triggerEnabled) { if (triggerEnabled) {
IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED); IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
Intent batteryStatus = mContext.registerReceiver(mBatteryLevelReceiver, filter); Intent batteryStatus = mContext.registerReceiver(mBatteryLevelReceiver, filter);
if (batteryStatus != null) {
mBatteryLevel = batteryStatus.getIntExtra(BatteryManager.EXTRA_LEVEL, 0); mBatteryLevel = batteryStatus.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
} }
} }
} }
}