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

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

Unregister prox sensor when QS or Bouncer are expanded. 

The FalsingManager doesn't need the prox sensor when its not being
used.

Bug: 149307116
Test: atest SystemUITests
Change-Id: Ib68c0a269c9f94b1a1bb0ba137a2bb5fde340bba
parent 998c6ad1

packages/SystemUI/plugin/src/com/android/systemui/plugins/FalsingManager.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import java.io.PrintWriter; 
public interface FalsingManager {

    int VERSION = 3;



    void onSucccessfulUnlock();

    void onSuccessfulUnlock();



    void onNotificationActive();

packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerFake.java

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public class FalsingManagerFake implements FalsingManager { 
    private boolean mIsReportingEnabled;



    @Override

    public void onSucccessfulUnlock() {

    public void onSuccessfulUnlock() {



    }

packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ public class FalsingManagerImpl implements FalsingManager { 
        sessionExitpoint(false /* force */);

    }



    public void onSucccessfulUnlock() {

    public void onSuccessfulUnlock() {

        if (FalsingLog.ENABLED) {

            FalsingLog.i("onSucccessfulUnlock", "");

        }

packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java

+2 −2
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ public class FalsingManagerProxy implements FalsingManager { 
    }



    @Override

    public void onSucccessfulUnlock() {

        mInternalFalsingManager.onSucccessfulUnlock();

    public void onSuccessfulUnlock() {

        mInternalFalsingManager.onSuccessfulUnlock();

    }



    @Override

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

+12 −4
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public class BrightLineFalsingManager implements FalsingManager { 


    private void updateInteractionType(@Classifier.InteractionType int type) {

        logDebug("InteractionType: " + type);

        mClassifiers.forEach((classifier) -> classifier.setInteractionType(type));

        mDataProvider.setInteractionType(type);

    }



    @Override
@@ -187,7 +187,7 @@ public class BrightLineFalsingManager implements FalsingManager { 
    }



    @Override

    public void onSucccessfulUnlock() {

    public void onSuccessfulUnlock() {

        if (mIsFalseTouchCalls != 0) {

            mMetricsLogger.histogram(FALSING_SUCCESS, mIsFalseTouchCalls);

            mIsFalseTouchCalls = 0;
@@ -212,7 +212,6 @@ public class BrightLineFalsingManager implements FalsingManager { 
    @Override

    public void onNotificatonStartDraggingDown() {

        updateInteractionType(Classifier.NOTIFICATION_DRAG_DOWN);



    }



    @Override
@@ -235,7 +234,12 @@ public class BrightLineFalsingManager implements FalsingManager { 
    }



    @Override

    public void setQsExpanded(boolean b) {

    public void setQsExpanded(boolean expanded) {

        if (expanded) {

            unregisterSensors();

        } else if (mSessionStarted) {

            registerSensors();

        }

    }



    @Override
@@ -338,10 +342,14 @@ public class BrightLineFalsingManager implements FalsingManager { 


    @Override

    public void onBouncerShown() {

        unregisterSensors();

    }



    @Override

    public void onBouncerHidden() {

        if (mSessionStarted) {

            registerSensors();

        }

    }



    @Override