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

Commit d7aa26f3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 7bed7895 8f72b3c7

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