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

Commit a600154f authored by Bill Lin's avatar Bill Lin Committed by Automerger Merge Worker
Browse files

Merge "Dismiss BiometricPrompt if window focus is lost" into tm-dev am: bee318e3 

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



Change-Id: Ib214ce29f17ee62129d1c8e7451563ac59dd3a77
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 180cc0f7 bee318e3

packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java

+10 −1
Original line number Diff line number Diff line
@@ -405,6 +405,15 @@ public class AuthContainerView extends LinearLayout 
        maybeUpdatePositionForUdfps(true /* invalidate */);

    }



    @Override

    public void onWindowFocusChanged(boolean hasWindowFocus) {

        super.onWindowFocusChanged(hasWindowFocus);

        if (!hasWindowFocus) {

            Log.v(TAG, "Lost window focus, dismissing the dialog");

            animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);

        }

    }



    @Override

    public void onAttachedToWindow() {

        super.onAttachedToWindow();
@@ -720,7 +729,7 @@ public class AuthContainerView extends LinearLayout 
        final WindowManager.LayoutParams lp = new WindowManager.LayoutParams(

                ViewGroup.LayoutParams.MATCH_PARENT,

                ViewGroup.LayoutParams.MATCH_PARENT,

                WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL,

                WindowManager.LayoutParams.TYPE_STATUS_BAR_ADDITIONAL,

                windowFlags,

                PixelFormat.TRANSLUCENT);

        lp.privateFlags |= WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS;

packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt

+17 −0
Original line number Diff line number Diff line
@@ -105,6 +105,23 @@ class AuthContainerViewTest : SysuiTestCase() { 
        verify(callback).onDialogAnimatedIn()

    }



    @Test

    fun testDismissesOnFocusLoss() {

        val container = initializeContainer()

        waitForIdleSync()



        verify(callback).onDialogAnimatedIn()



        container.onWindowFocusChanged(false)

        waitForIdleSync()



        verify(callback).onDismissed(

            eq(AuthDialogCallback.DISMISSED_USER_CANCELED),

            eq<ByteArray?>(null) /* credentialAttestation */

        )

        assertThat(container.parent).isNull()

    }



    @Test

    fun testActionAuthenticated_sendsDismissedAuthenticated() {

        val container = initializeContainer()