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

Commit 6f3d48f4 authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge "ClearBiometricRecognized when user switches" into rvc-dev am:... 

Merge "ClearBiometricRecognized when user switches" into rvc-dev am: 4cf90e8a am: 15ede3b2 am: df469ecb am: 090c4bba

Change-Id: I2f60b56613ec28a657cd70b622572eda9b423f24
parents c673f062 090c4bba

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

+34 −5
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    private static final boolean DEBUG = KeyguardConstants.DEBUG;

    private static final boolean DEBUG_SIM_STATES = KeyguardConstants.DEBUG_SIM_STATES;

    private static final boolean DEBUG_FACE = true;

    private static final boolean DEBUG_SPEW = false;

    private static final int LOW_BATTERY_THRESHOLD = 20;



    private static final String ACTION_FACE_UNLOCK_STARTED
@@ -324,7 +325,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                }

            };



    private class BiometricAuthenticated {

    @VisibleForTesting

    static class BiometricAuthenticated {

        private final boolean mAuthenticated;

        private final boolean mIsStrongBiometric;
@@ -338,11 +340,14 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    private SparseBooleanArray mUserHasTrust = new SparseBooleanArray();

    private SparseBooleanArray mUserTrustIsManaged = new SparseBooleanArray();

    private SparseBooleanArray mUserTrustIsUsuallyManaged = new SparseBooleanArray();

    private SparseArray<BiometricAuthenticated> mUserFingerprintAuthenticated = new SparseArray<>();

    private SparseArray<BiometricAuthenticated> mUserFaceAuthenticated = new SparseArray<>();

    private SparseBooleanArray mUserFaceUnlockRunning = new SparseBooleanArray();

    private Map<Integer, Intent> mSecondaryLockscreenRequirement = new HashMap<Integer, Intent>();



    @VisibleForTesting

    SparseArray<BiometricAuthenticated> mUserFingerprintAuthenticated = new SparseArray<>();

    @VisibleForTesting

    SparseArray<BiometricAuthenticated> mUserFaceAuthenticated = new SparseArray<>();



    private static int sCurrentUser;

    private Runnable mUpdateBiometricListeningState = this::updateBiometricListeningState;
@@ -1850,11 +1855,33 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 


        // Only listen if this KeyguardUpdateMonitor belongs to the primary user. There is an

        // instance of KeyguardUpdateMonitor for each user but KeyguardUpdateMonitor is user-aware.

        return (mBouncer || mAuthInterruptActive || awakeKeyguard || shouldListenForFaceAssistant())

        final boolean shouldListen =

                (mBouncer || mAuthInterruptActive || awakeKeyguard

                        || shouldListenForFaceAssistant())

                && !mSwitchingUser && !isFaceDisabled(user) && becauseCannotSkipBouncer

                && !mKeyguardGoingAway && mFaceSettingEnabledForUser.get(user) && !mLockIconPressed

                && strongAuthAllowsScanning && mIsPrimaryUser

                && !mSecureCameraLaunched;



        // Too chatty, but very useful when debugging issues.

        if (DEBUG_SPEW) {

            Log.v(TAG, "shouldListenForFace(" + user + ")=" + shouldListen + "... "

                    + ", mBouncer: " + mBouncer

                    + ", mAuthInterruptActive: " + mAuthInterruptActive

                    + ", awakeKeyguard: " + awakeKeyguard

                    + ", shouldListenForFaceAssistant: " + shouldListenForFaceAssistant()

                    + ", mSwitchingUser: " + mSwitchingUser

                    + ", isFaceDisabled(" + user + "): " + isFaceDisabled(user)

                    + ", becauseCannotSkipBouncer: " + becauseCannotSkipBouncer

                    + ", mKeyguardGoingAway: " + mKeyguardGoingAway

                    + ", mFaceSettingEnabledForUser(" + user + "): "

                            + mFaceSettingEnabledForUser.get(user)

                    + ", mLockIconPressed: " + mLockIconPressed

                    + ", strongAuthAllowsScanning: " + strongAuthAllowsScanning

                    + ", isPrimaryUser: " + mIsPrimaryUser

                    + ", mSecureCameraLaunched: " + mSecureCameraLaunched);

        }

        return shouldListen;

    }



    /**
@@ -2049,8 +2076,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    /**

     * Handle {@link #MSG_USER_SWITCHING}

     */

    private void handleUserSwitching(int userId, IRemoteCallback reply) {

    @VisibleForTesting

    void handleUserSwitching(int userId, IRemoteCallback reply) {

        Assert.isMainThread();

        clearBiometricRecognized();

        mUserTrustIsUsuallyManaged.put(userId, mTrustManager.isTrustUsuallyManaged(userId));

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

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

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

+20 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import android.hardware.face.FaceManager; 
import android.hardware.fingerprint.FingerprintManager;

import android.os.Bundle;

import android.os.Handler;

import android.os.IRemoteCallback;

import android.os.UserHandle;

import android.os.UserManager;

import android.telephony.ServiceState;
@@ -63,6 +64,7 @@ import android.testing.TestableContext; 
import android.testing.TestableLooper;



import com.android.internal.telephony.TelephonyIntents;

import com.android.keyguard.KeyguardUpdateMonitor.BiometricAuthenticated;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.dump.DumpManager;
@@ -505,6 +507,24 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        assertThat(mKeyguardUpdateMonitor.getUserCanSkipBouncer(user)).isFalse();

    }



    @Test

    public void testBiometricsCleared_whenUserSwitches() throws Exception {

        final IRemoteCallback reply = new IRemoteCallback.Stub() {

            @Override

            public void sendResult(Bundle data) {} // do nothing

        };

        final BiometricAuthenticated dummyAuthentication =

                new BiometricAuthenticated(true /* authenticated */, true /* strong */);

        mKeyguardUpdateMonitor.mUserFaceAuthenticated.put(0 /* user */, dummyAuthentication);

        mKeyguardUpdateMonitor.mUserFingerprintAuthenticated.put(0 /* user */, dummyAuthentication);

        assertThat(mKeyguardUpdateMonitor.mUserFingerprintAuthenticated.size()).isEqualTo(1);

        assertThat(mKeyguardUpdateMonitor.mUserFaceAuthenticated.size()).isEqualTo(1);



        mKeyguardUpdateMonitor.handleUserSwitching(10 /* user */, reply);

        assertThat(mKeyguardUpdateMonitor.mUserFingerprintAuthenticated.size()).isEqualTo(0);

        assertThat(mKeyguardUpdateMonitor.mUserFaceAuthenticated.size()).isEqualTo(0);

    }



    @Test

    public void testGetUserCanSkipBouncer_whenTrust() {

        int user = KeyguardUpdateMonitor.getCurrentUser();