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

Commit 1ec79276 authored by Beverly's avatar Beverly Committed by Automerger Merge Worker
Browse files

Revert change that would detectFp when FP is locked out am: 648fed59 

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



Change-Id: I0f2a0e01e5edc74b96243623d79e1c8d1b454b91
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents af9826ce 648fed59

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

+2 −1
Original line number Diff line number Diff line
@@ -2790,7 +2790,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
@@ -29,6 +29,7 @@ import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STR 
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_HELP_FACE_NOT_AVAILABLE;

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;
@@ -1175,10 +1176,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
@@ -421,6 +421,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 = mRegistry.getSingleProvider();

            if (provider == null) {

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