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

Commit 1f6347bd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Stop face auth if occluding app doesn't want face auth." into... 

Merge "Stop face auth if occluding app doesn't want face auth." into tm-qpr-dev am: e43723b8 am: 423bdcf9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20508267



Change-Id: I60f544f2f7d218ab7f1aae7f34b45adcf623eb8a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 88c07b66 423bdcf9

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+2 −2
Original line number Diff line number Diff line
@@ -735,8 +735,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
     */

    public void requestFaceAuthOnOccludingApp(boolean request) {

        mOccludingAppRequestingFace = request;

        updateFaceListeningState(BIOMETRIC_ACTION_UPDATE,

                FACE_AUTH_TRIGGERED_OCCLUDING_APP_REQUESTED);

        int action = mOccludingAppRequestingFace ? BIOMETRIC_ACTION_UPDATE : BIOMETRIC_ACTION_STOP;

        updateFaceListeningState(action, FACE_AUTH_TRIGGERED_OCCLUDING_APP_REQUESTED);

    }



    /**

packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java

+18 −0
Original line number Diff line number Diff line
@@ -1283,6 +1283,24 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        assertThat(mKeyguardUpdateMonitor.isFaceDetectionRunning()).isEqualTo(true);

    }



    @Test

    public void testRequestFaceAuthFromOccludingApp_whenInvoked_startsFaceAuth() {

        mKeyguardUpdateMonitor.requestFaceAuthOnOccludingApp(true);



        assertThat(mKeyguardUpdateMonitor.isFaceDetectionRunning()).isTrue();

    }



    @Test

    public void testRequestFaceAuthFromOccludingApp_whenInvoked_stopsFaceAuth() {

        mKeyguardUpdateMonitor.requestFaceAuthOnOccludingApp(true);



        assertThat(mKeyguardUpdateMonitor.isFaceDetectionRunning()).isTrue();



        mKeyguardUpdateMonitor.requestFaceAuthOnOccludingApp(false);



        assertThat(mKeyguardUpdateMonitor.isFaceDetectionRunning()).isFalse();

    }



    @Test

    public void testRequireUnlockForNfc_Broadcast() {

        KeyguardUpdateMonitorCallback callback = mock(KeyguardUpdateMonitorCallback.class);