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

Commit d3443820 authored by Chandru S's avatar Chandru S Committed by Automerger Merge Worker
Browse files

BypassEnabled change is not propagated when face enrollment state changes. am: 15d98dc3 

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



Change-Id: I06ec1aff16e32912d892e8d561ee0701284039c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d894cae 15d98dc3

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

+27 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; 
import static android.content.Intent.ACTION_USER_REMOVED;

import static android.content.Intent.ACTION_USER_STOPPED;

import static android.content.Intent.ACTION_USER_UNLOCKED;

import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE;

import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT;

import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_LOCKOUT_NONE;

import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_LOCKOUT_PERMANENT;

import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_LOCKOUT_TIMED;
@@ -251,6 +253,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    private static final int MSG_REQUIRE_NFC_UNLOCK = 345;

    private static final int MSG_KEYGUARD_DISMISS_ANIMATION_FINISHED = 346;

    private static final int MSG_SERVICE_PROVIDERS_UPDATED = 347;

    private static final int MSG_BIOMETRIC_ENROLLMENT_STATE_CHANGED = 348;



    /** Biometric authentication state: Not listening. */

    private static final int BIOMETRIC_STATE_STOPPED = 0;
@@ -2484,6 +2487,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                    case MSG_KEYGUARD_DISMISS_ANIMATION_FINISHED:

                        handleKeyguardDismissAnimationFinished();

                        break;

                    case MSG_BIOMETRIC_ENROLLMENT_STATE_CHANGED:

                        notifyAboutEnrollmentChange(msg.arg1);

                        break;

                    default:

                        super.handleMessage(msg);

                        break;
@@ -2584,6 +2590,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 


            @Override

            public void onEnrollmentsChanged(@BiometricAuthenticator.Modality int modality) {

                mHandler.obtainMessage(MSG_BIOMETRIC_ENROLLMENT_STATE_CHANGED, modality, 0)

                        .sendToTarget();

                mainExecutor.execute(() -> updateBiometricListeningState(BIOMETRIC_ACTION_UPDATE,

                        FACE_AUTH_TRIGGERED_ENROLLMENTS_CHANGED));

            }
@@ -3433,6 +3441,25 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        return mIsFaceEnrolled;

    }



    private void notifyAboutEnrollmentChange(@BiometricAuthenticator.Modality int modality) {

        BiometricSourceType biometricSourceType;

        if (modality == TYPE_FINGERPRINT) {

            biometricSourceType = FINGERPRINT;

        } else if (modality == TYPE_FACE) {

            biometricSourceType = FACE;

        } else {

            return;

        }

        mLogger.notifyAboutEnrollmentsChanged(biometricSourceType);

        Assert.isMainThread();

        for (int i = 0; i < mCallbacks.size(); i++) {

            KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();

            if (cb != null) {

                cb.onBiometricEnrollmentStateChanged(biometricSourceType);

            }

        }

    }



    private void stopListeningForFingerprint() {

        mLogger.v("stopListeningForFingerprint()");

        if (mFingerprintRunningState == BIOMETRIC_STATE_RUNNING) {

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

+5 −0
Original line number Diff line number Diff line
@@ -327,4 +327,9 @@ public class KeyguardUpdateMonitorCallback { 
     * Called when the enabled trust agents associated with the specified user.

     */

    public void onEnabledTrustAgentsChanged(int userId) { }



    /**

     * On biometric enrollment state changed

     */

    public void onBiometricEnrollmentStateChanged(BiometricSourceType biometricSourceType) { }

}

packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt

+18 −10
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.keyguard.logging 


import android.content.Intent

import android.hardware.biometrics.BiometricConstants.LockoutMode

import android.hardware.biometrics.BiometricSourceType

import android.os.PowerManager

import android.os.PowerManager.WakeReason

import android.telephony.ServiceState
@@ -377,9 +378,7 @@ constructor(@KeyguardUpdateMonitorLog private val logBuffer: LogBuffer) { 
                str1 = intent.getStringExtra(TelephonyManager.EXTRA_SPN)

                str2 = intent.getStringExtra(TelephonyManager.EXTRA_PLMN)

            },

                {

                    "action SERVICE_PROVIDERS_UPDATED subId=$int1 spn=$str1 plmn=$str2"

                }

            { "action SERVICE_PROVIDERS_UPDATED subId=$int1 spn=$str1 plmn=$str2" }

        )

    }
@@ -719,4 +718,13 @@ constructor(@KeyguardUpdateMonitorLog private val logBuffer: LogBuffer) { 
    fun scheduleWatchdog(@CompileTimeConstant watchdogType: String) {

        logBuffer.log(TAG, DEBUG, "Scheduling biometric watchdog for $watchdogType")

    }



    fun notifyAboutEnrollmentsChanged(biometricSourceType: BiometricSourceType) {

        logBuffer.log(

            TAG,

            DEBUG,

            { str1 = "$biometricSourceType" },

            { "notifying about enrollments changed: $str1" }

        )

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java

+17 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.systemui.statusbar.policy;



import static android.hardware.biometrics.BiometricSourceType.FACE;



import android.annotation.NonNull;

import android.content.BroadcastReceiver;

import android.content.Context;
@@ -199,6 +201,11 @@ public class KeyguardStateControllerImpl implements KeyguardStateController, Dum 
        Trace.endSection();

    }



    private void notifyKeyguardFaceAuthEnabledChanged() {

        // Copy the list to allow removal during callback.

        new ArrayList<>(mCallbacks).forEach(Callback::onFaceAuthEnabledChanged);

    }



    private void notifyUnlockedChanged() {

        Trace.beginSection("KeyguardStateController#notifyUnlockedChanged");

        // Copy the list to allow removal during callback.
@@ -418,6 +425,16 @@ public class KeyguardStateControllerImpl implements KeyguardStateController, Dum 
            update(false /* updateAlways */);

        }



        @Override

        public void onBiometricEnrollmentStateChanged(BiometricSourceType biometricSourceType) {

            if (biometricSourceType == FACE) {

                // We only care about enrollment state here. Keyguard face auth enabled is just

                // same as face auth enrolled

                update(false);

                notifyKeyguardFaceAuthEnabledChanged();

            }

        }



        @Override

        public void onStartedWakingUp() {

            update(false /* updateAlways */);

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

+19 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ import android.content.pm.ServiceInfo; 
import android.content.pm.UserInfo;

import android.database.ContentObserver;

import android.hardware.SensorPrivacyManager;

import android.hardware.biometrics.BiometricAuthenticator;

import android.hardware.biometrics.BiometricConstants;

import android.hardware.biometrics.BiometricManager;

import android.hardware.biometrics.BiometricSourceType;
@@ -3000,6 +3001,24 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
                TelephonyManager.SIM_STATE_UNKNOWN);

    }



    @Test

    public void onAuthEnrollmentChangesCallbacksAreNotified() {

        KeyguardUpdateMonitorCallback callback = mock(KeyguardUpdateMonitorCallback.class);

        ArgumentCaptor<AuthController.Callback> authCallback = ArgumentCaptor.forClass(

                AuthController.Callback.class);

        verify(mAuthController).addCallback(authCallback.capture());



        mKeyguardUpdateMonitor.registerCallback(callback);



        authCallback.getValue().onEnrollmentsChanged(TYPE_FINGERPRINT);

        mTestableLooper.processAllMessages();

        verify(callback).onBiometricEnrollmentStateChanged(BiometricSourceType.FINGERPRINT);



        authCallback.getValue().onEnrollmentsChanged(BiometricAuthenticator.TYPE_FACE);

        mTestableLooper.processAllMessages();

        verify(callback).onBiometricEnrollmentStateChanged(BiometricSourceType.FACE);

    }



    private void verifyFingerprintAuthenticateNeverCalled() {

        verify(mFingerprintManager, never()).authenticate(any(), any(), any(), any(), any());

        verify(mFingerprintManager, never()).authenticate(any(), any(), any(), any(), anyInt(),