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

Commit 5104d677 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... 

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

Change-Id: Ia8866d0584d7a27f229d701d0c2d989dad3c1197
parents ad9617ef e406d724

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

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

        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 {

    private class ProxSensor implements SensorEventListener {





        static final long COOLDOWN_TRIGGER = 2 * 1000;

        static final long COOLDOWN_TRIGGER = 2 * 1000;

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

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

    private void proximityCheckThenCall(IntConsumer callback,

            boolean alreadyPerformedProxCheck,

            boolean alreadyPerformedProxCheck,

            int pulseReason) {

            int pulseReason) {

        Boolean cachedProxFar = mDozeSensors.isProximityCurrentlyFar();

        if (alreadyPerformedProxCheck) {

        if (alreadyPerformedProxCheck) {

            callback.accept(ProximityCheck.RESULT_NOT_CHECKED);

            callback.accept(ProximityCheck.RESULT_NOT_CHECKED);

        } else if (cachedProxFar != null) {

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

        } else {

        } else {

            final long start = SystemClock.uptimeMillis();

            final long start = SystemClock.uptimeMillis();

            new ProximityCheck() {

            new ProximityCheck() {