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

Don't cache mIsUdfpsEnrolled

Browse Source 
AuthController.isUdfpsEnrolled no longer makes
any IPC calls, so we don't need to cache the value
in KeyguardUpdateMonitor which can cause the state
to be stale.

Test: manually check dumpsys on reboot, udfps enrollment state
is correct
Test: atest SystemUITests
Fixes: 218718078
Change-Id: I4f81465743cdea9e8f01b6bfd5637d0ee450c29a
This commit is contained in:
Beverly
2022-02-09 21:37:39 +00:00
committed by Beverly Tai
parent c133afd45a
commit 929c8cdc71
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -325,8 +325,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;
@@ -2117,10 +2115,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()
@@ -2132,7 +2126,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());
}
/**
@@ -2186,7 +2180,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;

2
packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
View File

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