Merge "Log FP & face enrollment state only if it changes." into udc-dev (a7c88598) · Commits · e / os / android_frameworks_base

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);
		}