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

Commit 3464d757 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the NPE in the tryToFetchUsageData() method" into main am: 250101cd 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3424441



Change-Id: I7376d3e498ebca9eeaa90244d8b2da6b6ad7d658
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bde00faa 250101cd

src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java

+4 −0
Original line number Diff line number Diff line
@@ -106,6 +106,10 @@ public final class BatteryUsageBroadcastReceiver extends BroadcastReceiver { 


    private void tryToFetchUsageData(Context context) {

        final Intent batteryIntent = BatteryUtils.getBatteryIntent(context);

        if (batteryIntent == null) {

            Log.w(TAG, "tryToFetchUsageData: ignore from null battery intent");

            return;

        }

        // Returns when battery is not fully charged.

        if (!BatteryStatus.isCharged(batteryIntent)) {

            return;