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

Commit bdc9d47c authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "AOD: Fix possible NPE in DozeSensors" into oc-dr1-dev 

am: d7aa26f3

Change-Id: Iadaf84ba4425de21c40dbf4ebe373e6143833c94
parents 7be2711d d7aa26f3

packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java

+3 −1
Original line number Diff line number Diff line
@@ -233,7 +233,9 @@ public class DozeSensors { 
            mProxCallback.accept(mCurrentlyFar);



            long now = SystemClock.elapsedRealtime();

            if (!mCurrentlyFar) {

            if (mCurrentlyFar == null) {

                // Sensor has been unregistered by the proxCallback. Do nothing.

            } else if (!mCurrentlyFar) {

                mLastNear = now;

            } else if (mCurrentlyFar && now - mLastNear < COOLDOWN_TRIGGER) {

                // If the last near was very recent, we might be using more power for prox