Merge "Don't cache mIsUdfpsEnrolled"
This commit is contained in:
committed by
Android (Google) Code Review
commit
4a32d15837
@@ -319,8 +319,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|
||||
private final InteractionJankMonitor mInteractionJankMonitor;
|
||||
private final LatencyTracker mLatencyTracker;
|
||||
private boolean mLogoutEnabled;
|
||||
// cached value to avoid IPCs
|
||||
private boolean mIsUdfpsEnrolled;
|
||||
private boolean mIsFaceEnrolled;
|
||||
// If the user long pressed the lock icon, disabling face auth for the current session.
|
||||
private boolean mLockIconPressed;
|
||||
@@ -2093,10 +2091,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|
||||
false, mTimeFormatChangeObserver, UserHandle.USER_ALL);
|
||||
}
|
||||
|
||||
private void updateUdfpsEnrolled(int userId) {
|
||||
mIsUdfpsEnrolled = mAuthController.isUdfpsEnrolled(userId);
|
||||
}
|
||||
|
||||
private void updateFaceEnrolled(int userId) {
|
||||
mIsFaceEnrolled = whitelistIpcs(
|
||||
() -> mFaceManager != null && mFaceManager.isHardwareDetected()
|
||||
@@ -2108,7 +2102,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|
||||
* @return true if there's at least one udfps enrolled for the current user.
|
||||
*/
|
||||
public boolean isUdfpsEnrolled() {
|
||||
return mIsUdfpsEnrolled;
|
||||
return mAuthController.isUdfpsEnrolled(getCurrentUser());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2162,7 +2156,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|
||||
return;
|
||||
}
|
||||
|
||||
updateUdfpsEnrolled(getCurrentUser());
|
||||
final boolean shouldListenForFingerprint = shouldListenForFingerprint(isUdfpsSupported());
|
||||
final boolean runningOrRestarting = mFingerprintRunningState == BIOMETRIC_STATE_RUNNING
|
||||
|| mFingerprintRunningState == BIOMETRIC_STATE_CANCELLING_RESTARTING;
|
||||
|
||||
@@ -433,7 +433,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
|
||||
public void onDozingChanged(boolean isDozing) {
|
||||
mIsDozing = isDozing;
|
||||
updateBurnInOffsets();
|
||||
updateIsUdfpsEnrolled();
|
||||
updateVisibility();
|
||||
}
|
||||
|
||||
@@ -513,7 +512,6 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
|
||||
mKeyguardUpdateMonitor.getUserUnlockedWithBiometric(
|
||||
KeyguardUpdateMonitor.getCurrentUser());
|
||||
}
|
||||
updateIsUdfpsEnrolled();
|
||||
updateVisibility();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user