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

Commit 8591bb71 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE when registering BatteryTrigger before first BATTERY_CHANGED... 

Merge "Fix NPE when registering BatteryTrigger before first BATTERY_CHANGED broadcast" into udc-dev am: 7b459478

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



Change-Id: I7512b6fe2dc42eae5d4a5841994e19fe2d708158
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b93515e2 7b459478

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

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

            }

            }

        }

        }

    }

    }

}