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 am: 7b45947867

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22190776

Change-Id: I7512b6fe2dc42eae5d4a5841994e19fe2d708158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dmitri Plotnikov
2023-03-23 15:16:22 +00:00
committed by Automerger Merge Worker
parent b93515e268 7b45947867
commit 8591bb7124
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) { 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);
mBatteryLevel = batteryStatus.getIntExtra(BatteryManager.EXTRA_LEVEL, 0); if (batteryStatus != null) {
mBatteryLevel = batteryStatus.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
}
} }
} }
} }