Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I588986e1d342ce0fd2950900d9e273186f15c1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-03-09 02:32:08 +00:00
committed by Automerger Merge Worker
parent 831f043463 b188d33eec
commit 9448570d67
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -2439,9 +2439,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
() -> mFaceManager != null && mFaceManager.isHardwareDetected() () -> mFaceManager != null && mFaceManager.isHardwareDetected()
&& mFaceManager.hasEnrolledTemplates(userId) && mFaceManager.hasEnrolledTemplates(userId)
&& mBiometricEnabledForUser.get(userId)); && mBiometricEnabledForUser.get(userId));
mIsFaceEnrolled = isFaceEnrolled; if (mIsFaceEnrolled != isFaceEnrolled) {
mLogger.logFaceEnrolledUpdated(mIsFaceEnrolled, isFaceEnrolled); mLogger.logFaceEnrolledUpdated(mIsFaceEnrolled, isFaceEnrolled);
} }
mIsFaceEnrolled = isFaceEnrolled;
}
public boolean isFaceSupported() { public boolean isFaceSupported() {
return mFaceManager != null && mFaceManager.isHardwareDetected(); return mFaceManager != null && mFaceManager.isHardwareDetected();
@@ -3100,12 +3102,13 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
@VisibleForTesting @VisibleForTesting
boolean isUnlockWithFingerprintPossible(int userId) { boolean isUnlockWithFingerprintPossible(int userId) {
// TODO (b/242022358), make this rely on onEnrollmentChanged event and update it only once. // TODO (b/242022358), make this rely on onEnrollmentChanged event and update it only once.
boolean fpEnrolled = mFpm != null && mFpm.isHardwareDetected() boolean newFpEnrolled = mFpm != null && mFpm.isHardwareDetected()
&& !isFingerprintDisabled(userId) && mFpm.hasEnrolledTemplates(userId); && !isFingerprintDisabled(userId) && mFpm.hasEnrolledTemplates(userId);
mLogger.logFpEnrolledUpdated(userId, Boolean oldFpEnrolled = mIsUnlockWithFingerprintPossible.getOrDefault(userId, false);
mIsUnlockWithFingerprintPossible.getOrDefault(userId, false), if (oldFpEnrolled != newFpEnrolled) {
fpEnrolled); mLogger.logFpEnrolledUpdated(userId, oldFpEnrolled, newFpEnrolled);
mIsUnlockWithFingerprintPossible.put(userId, fpEnrolled); }
mIsUnlockWithFingerprintPossible.put(userId, newFpEnrolled);
return mIsUnlockWithFingerprintPossible.get(userId); return mIsUnlockWithFingerprintPossible.get(userId);
} }