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

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

Merge "AOD: Skip prox check if cached prox value available" into oc-dr1-dev 

am: f96573f8

Change-Id: I618be0eb195c3a3abcceb01d08c3f159b6c6a016
parents efb79319 f96573f8

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

+7 −0
Original line number Diff line number Diff line
@@ -184,6 +184,13 @@ public class DozeSensors { 
        pw.print("ProxSensor: "); pw.println(mProxSensor.toString());

    }



    /**

     * @return true if prox is currently far, false if near or null if unknown.

     */

    public Boolean isProximityCurrentlyFar() {

        return mProxSensor.mCurrentlyFar;

    }



    private class ProxSensor implements SensorEventListener {



        static final long COOLDOWN_TRIGGER = 2 * 1000;

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

+3 −0
Original line number Diff line number Diff line
@@ -103,8 +103,11 @@ public class DozeTriggers implements DozeMachine.Part { 
    private void proximityCheckThenCall(IntConsumer callback,

            boolean alreadyPerformedProxCheck,

            int pulseReason) {

        Boolean cachedProxFar = mDozeSensors.isProximityCurrentlyFar();

        if (alreadyPerformedProxCheck) {

            callback.accept(ProximityCheck.RESULT_NOT_CHECKED);

        } else if (cachedProxFar != null) {

            callback.accept(cachedProxFar ? ProximityCheck.RESULT_FAR : ProximityCheck.RESULT_NEAR);

        } else {

            final long start = SystemClock.uptimeMillis();

            new ProximityCheck() {