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

Commit 1a6d9e6a authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Do not allow the FalsingManager sesion to start when AOD is showing. 

Bug: 138220274
Test: manual

Change-Id: I6d14db66d53a668b7cf8dd15ebb489fb3ebf4c7c
parent 86de601b

packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java

+8 −2
Original line number Original line Diff line number Diff line
@@ -50,6 +50,8 @@ public class BrightLineFalsingManager implements FalsingManager { 
    private boolean mSessionStarted;

    private boolean mSessionStarted;

    private MetricsLogger mMetricsLogger;

    private MetricsLogger mMetricsLogger;

    private int mIsFalseTouchCalls;

    private int mIsFalseTouchCalls;

    private boolean mShowingAod;

    private boolean mScreenOn;





    private final ExecutorService mBackgroundExecutor = Executors.newSingleThreadExecutor();

    private final ExecutorService mBackgroundExecutor = Executors.newSingleThreadExecutor();
@@ -105,7 +107,7 @@ public class BrightLineFalsingManager implements FalsingManager { 
    }

    }





    private void sessionStart() {

    private void sessionStart() {

        if (!mSessionStarted) {

        if (!mSessionStarted && !mShowingAod && mScreenOn) {

            logDebug("Starting Session");

            logDebug("Starting Session");

            mSessionStarted = true;

            mSessionStarted = true;

            registerSensors();

            registerSensors();
@@ -174,6 +176,7 @@ public class BrightLineFalsingManager implements FalsingManager { 
            mMetricsLogger.histogram(FALSING_SUCCESS, mIsFalseTouchCalls);

            mMetricsLogger.histogram(FALSING_SUCCESS, mIsFalseTouchCalls);

            mIsFalseTouchCalls = 0;

            mIsFalseTouchCalls = 0;

        }

        }

        sessionEnd();

    }

    }





    @Override

    @Override
@@ -182,6 +185,7 @@ public class BrightLineFalsingManager implements FalsingManager { 




    @Override

    @Override

    public void setShowingAod(boolean showingAod) {

    public void setShowingAod(boolean showingAod) {

        mShowingAod = showingAod;

        if (showingAod) {

        if (showingAod) {

            sessionEnd();

            sessionEnd();

        } else {

        } else {
@@ -266,7 +270,7 @@ public class BrightLineFalsingManager implements FalsingManager { 




    @Override

    @Override

    public void onScreenOnFromTouch() {

    public void onScreenOnFromTouch() {

        sessionStart();

        onScreenTurningOn();

    }

    }





    @Override

    @Override
@@ -288,11 +292,13 @@ public class BrightLineFalsingManager implements FalsingManager { 




    @Override

    @Override

    public void onScreenTurningOn() {

    public void onScreenTurningOn() {

        mScreenOn = true;

        sessionStart();

        sessionStart();

    }

    }





    @Override

    @Override

    public void onScreenOff() {

    public void onScreenOff() {

        mScreenOn = false;

        sessionEnd();

        sessionEnd();

    }

    }