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

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

Merge "Log FP & face enrollment state only if it changes." into udc-dev am:... 

Merge "Log FP & face enrollment state only if it changes." into udc-dev am: a7c88598 am: 1582f7c6

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



Change-Id: Ib151bf3b4f719494b111d633e810c0bcfb08ff6c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 26e0058d 1582f7c6

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

+9 −6
Original line number Diff line number Diff line
@@ -2459,9 +2459,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        Boolean isFaceEnrolled = mFaceManager != null && !mFaceSensorProperties.isEmpty()

                && mBiometricEnabledForUser.get(userId)

                && mAuthController.isFaceAuthEnrolled(userId);

        mIsFaceEnrolled = isFaceEnrolled;

        if (mIsFaceEnrolled != isFaceEnrolled) {

            mLogger.logFaceEnrolledUpdated(mIsFaceEnrolled, isFaceEnrolled);

        }

        mIsFaceEnrolled = isFaceEnrolled;

    }



    public boolean isFaceSupported() {

        return mFaceManager != null && !mFaceSensorProperties.isEmpty();
@@ -3132,13 +3134,14 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    @VisibleForTesting

    boolean isUnlockWithFingerprintPossible(int userId) {

        // TODO (b/242022358), make this rely on onEnrollmentChanged event and update it only once.

        boolean fpEnrolled = mFpm != null

        boolean newFpEnrolled = mFpm != null

                && !mFingerprintSensorProperties.isEmpty()

                && !isFingerprintDisabled(userId) && mFpm.hasEnrolledTemplates(userId);

        mLogger.logFpEnrolledUpdated(userId,

                mIsUnlockWithFingerprintPossible.getOrDefault(userId, false),

                fpEnrolled);

        mIsUnlockWithFingerprintPossible.put(userId, fpEnrolled);

        Boolean oldFpEnrolled = mIsUnlockWithFingerprintPossible.getOrDefault(userId, false);

        if (oldFpEnrolled != newFpEnrolled) {

            mLogger.logFpEnrolledUpdated(userId, oldFpEnrolled, newFpEnrolled);

        }

        mIsUnlockWithFingerprintPossible.put(userId, newFpEnrolled);

        return mIsUnlockWithFingerprintPossible.get(userId);

    }