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

Commit 1d59d3bc authored by Nicolò Mazzucato's avatar Nicolò Mazzucato Committed by Automerger Merge Worker
Browse files

Merge "Use separate locks for BatteryController estimation and callbacks" into... 

Merge "Use separate locks for BatteryController estimation and callbacks" into tm-qpr-dev am: a76b1162 am: 81565519 am: 92449dcc am: fdc82cc4

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



Change-Id: Icaf787e439394afdeab3c62e6100bcc946f8a9b1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2531d29a fdc82cc4

packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java

+8 −2
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ import java.util.ArrayList; 
import java.util.List;

import java.util.concurrent.atomic.AtomicReference;



import javax.annotation.concurrent.GuardedBy;



/**

 * Default implementation of a {@link BatteryController}. This controller monitors for battery

 * level change events that are broadcasted by the system.
@@ -94,7 +96,10 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC 
    private boolean mTestMode = false;

    @VisibleForTesting

    boolean mHasReceivedBattery = false;

    @GuardedBy("mEstimateLock")

    private Estimate mEstimate;

    private final Object mEstimateLock = new Object();



    private boolean mFetchingEstimate = false;



    // Use AtomicReference because we may request it from a different thread
@@ -321,7 +326,7 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC 


    @Nullable

    private String generateTimeRemainingString() {

        synchronized (mFetchCallbacks) {

        synchronized (mEstimateLock) {

            if (mEstimate == null) {

                return null;

            }
@@ -340,7 +345,7 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC 
        mFetchingEstimate = true;

        mBgHandler.post(() -> {

            // Only fetch the estimate if they are enabled

            synchronized (mFetchCallbacks) {

            synchronized (mEstimateLock) {

                mEstimate = null;

                if (mEstimates.isHybridNotificationEnabled()) {

                    updateEstimate();
@@ -363,6 +368,7 @@ public class BatteryControllerImpl extends BroadcastReceiver implements BatteryC 
    }



    @WorkerThread

    @GuardedBy("mEstimateLock")

    private void updateEstimate() {

        Assert.isNotMainThread();

        // if the estimate has been cached we can just use that, otherwise get a new one and