Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bf8a781 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Fix NPE when registering BatteryTrigger before first BATTERY_CHANGED broadcast 

Bug: 274544025
Test: reboot the device while plugged in
Change-Id: Iebaebbc1266c5e3894bc9fb65bd1b2dd27ec31f3
parent e5e601c6

services/core/java/com/android/server/powerstats/BatteryTrigger.java

+3 −1
Original line number Diff line number Diff line
@@ -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);

            if (batteryStatus != null) {

                mBatteryLevel = batteryStatus.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);

            }

        }

    }

}