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

Commit cb9aa5e1 authored by Diya Bera's avatar Diya Bera Committed by Automerger Merge Worker
Browse files

[DO NOT MERGE] Reset face_unlock_re_enroll value on reboot am: ac7739d7 

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



Change-Id: I3abdac5304f0be9fec7df165438d3ef3843ac748
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8a855315 ac7739d7

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

+3 −0
Original line number Diff line number Diff line
@@ -177,6 +177,9 @@ public class BiometricNotificationService implements CoreStartable { 
        if (mFaceManager != null) {

            mFaceManager.registerBiometricStateListener(mFaceStateListener);

        }

        Settings.Secure.putIntForUser(mContext.getContentResolver(),

                Settings.Secure.FACE_UNLOCK_RE_ENROLL, REENROLL_NOT_REQUIRED,

                UserHandle.USER_CURRENT);

    }



    private void queueFaceReenrollNotification() {

packages/SystemUI/tests/src/com/android/systemui/biometrics/BiometricNotificationServiceTest.java

+24 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.google.common.truth.Truth.assertThat; 


import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -86,6 +87,7 @@ public class BiometricNotificationServiceTest extends SysuiTestCase { 


    private final ArgumentCaptor<Notification> mNotificationArgumentCaptor =

            ArgumentCaptor.forClass(Notification.class);

    private BiometricNotificationService mBiometricNotificationService;

    private TestableLooper mLooper;

    private KeyguardUpdateMonitorCallback mKeyguardUpdateMonitorCallback;

    private KeyguardStateController.Callback mKeyguardStateControllerCallback;
@@ -104,7 +106,7 @@ public class BiometricNotificationServiceTest extends SysuiTestCase { 
        BiometricNotificationDialogFactory dialogFactory = new BiometricNotificationDialogFactory();

        BiometricNotificationBroadcastReceiver broadcastReceiver =

                new BiometricNotificationBroadcastReceiver(mContext, dialogFactory);

        BiometricNotificationService biometricNotificationService =

        mBiometricNotificationService =

                new BiometricNotificationService(mContext,

                        mKeyguardUpdateMonitor, mKeyguardStateController, handler,

                        mNotificationManager,
@@ -112,7 +114,7 @@ public class BiometricNotificationServiceTest extends SysuiTestCase { 
                        mFingerprintReEnrollNotificationOptional,

                        mFingerprintManager,

                        mFaceManager);

        biometricNotificationService.start();

        mBiometricNotificationService.start();



        ArgumentCaptor<KeyguardUpdateMonitorCallback> updateMonitorCallbackArgumentCaptor =

                ArgumentCaptor.forClass(KeyguardUpdateMonitorCallback.class);
@@ -231,4 +233,24 @@ public class BiometricNotificationServiceTest extends SysuiTestCase { 
                eq(UserHandle.CURRENT));

    }



    @Test

    public void testResetFaceUnlockReEnroll_onStart() {

        when(mKeyguardStateController.isShowing()).thenReturn(false);



        mKeyguardUpdateMonitorCallback.onBiometricError(

                BiometricFaceConstants.BIOMETRIC_ERROR_RE_ENROLL,

                "Testing Face Re-enrollment" /* errString */,

                BiometricSourceType.FACE

        );



        mBiometricNotificationService.start();

        mKeyguardStateControllerCallback.onKeyguardShowingChanged();



        mLooper.moveTimeForward(SHOW_NOTIFICATION_DELAY_MS);

        mLooper.processAllMessages();



        verify(mNotificationManager, never()).notifyAsUser(eq(TAG), eq(FACE_NOTIFICATION_ID),

                mNotificationArgumentCaptor.capture(), any());

    }



}