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

Commit cdc63a6b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21465508'] into tm-qpr2-release. 

Change-Id: I439b5fb2d7b53b72aebb358631c3e1ea4d99ead5
parents 50083c25 d31062b5

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

+2 −1
Original line number Diff line number Diff line
@@ -2735,7 +2735,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 


        boolean shouldListen = shouldListenKeyguardState && shouldListenUserState

                && shouldListenBouncerState && shouldListenUdfpsState

                && shouldListenSideFpsState;

                && shouldListenSideFpsState

                && !isFingerprintLockedOut();

        logListenerModelData(

                new KeyguardFingerprintListenModel(

                    System.currentTimeMillis(),

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

+5 −3
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.SOM 
import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_BOOT;

import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN;

import static com.android.keyguard.FaceAuthApiRequestReason.NOTIFICATION_PANEL_CLICKED;

import static com.android.keyguard.KeyguardUpdateMonitor.BIOMETRIC_STATE_CANCELLING;

import static com.android.keyguard.KeyguardUpdateMonitor.BIOMETRIC_STATE_CANCELLING_RESTARTING;

import static com.android.keyguard.KeyguardUpdateMonitor.DEFAULT_CANCEL_SIGNAL_TIMEOUT;

import static com.android.keyguard.KeyguardUpdateMonitor.HAL_POWER_PRESS_TIMEOUT;
@@ -1040,10 +1041,11 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        assertThat(mKeyguardUpdateMonitor.isFingerprintLockedOut()).isEqualTo(fpLocked);

        assertThat(mKeyguardUpdateMonitor.isFaceLockedOut()).isEqualTo(faceLocked);



        // Fingerprint should be restarted once its cancelled bc on lockout, the device

        // can still detectFingerprint (and if it's not locked out, fingerprint can listen)

        // Fingerprint should be cancelled on lockout if going to lockout state, else

        // restarted if it's not

        assertThat(mKeyguardUpdateMonitor.mFingerprintRunningState)

                .isEqualTo(BIOMETRIC_STATE_CANCELLING_RESTARTING);

                .isEqualTo(fpLocked

                        ? BIOMETRIC_STATE_CANCELLING : BIOMETRIC_STATE_CANCELLING_RESTARTING);

    }



    @Test

services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java

+7 −0
Original line number Diff line number Diff line
@@ -452,6 +452,13 @@ public class FingerprintService extends SystemService { 
                return -1;

            }



            if (!Utils.isUserEncryptedOrLockdown(mLockPatternUtils, userId)) {

                // If this happens, something in KeyguardUpdateMonitor is wrong. This should only

                // ever be invoked when the user is encrypted or lockdown.

                Slog.e(TAG, "detectFingerprint invoked when user is not encrypted or lockdown");

                return -1;

            }



            final Pair<Integer, ServiceProvider> provider = getSingleProvider();

            if (provider == null) {

                Slog.w(TAG, "Null provider for detectFingerprint");