diff options
| author | Joshua McCloskey <joshmccloskey@google.com> | 2022-07-19 21:01:55 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-08-10 02:45:34 +0000 |
| commit | 75a93eae5c259da7889821c1d667552836d6f1a5 (patch) | |
| tree | 29500f3c842cebb742e747b77bb11408cbb8dca6 | |
| parent | a0eddeccf7771620c08308b4b234f1eee7bacc65 (diff) | |
| download | base-75a93eae5c259da7889821c1d667552836d6f1a5.tar.gz | |
Updated keyguard to be robust against fpm
Test: Manual
Bug: 241084172
Change-Id: If51313b03dc40442ad6c42603f77579e77b0c873
Merged-In: If51313b03dc40442ad6c42603f77579e77b0c873
(cherry picked from commit bfd27670aea5ffecb97f210cde819cc71dafce6e)
Merged-In: If51313b03dc40442ad6c42603f77579e77b0c873
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 727d108df339..e87feff59b83 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -751,6 +751,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab private void handleFingerprintAuthFailed() { Assert.isMainThread(); + if (mHandler.hasCallbacks(mFpCancelNotReceived)) { + Log.d(TAG, "handleFingerprintAuthFailed()" + + " triggered while waiting for cancellation, removing watchdog"); + mHandler.removeCallbacks(mFpCancelNotReceived); + } for (int i = 0; i < mCallbacks.size(); i++) { KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get(); if (cb != null) { @@ -781,6 +786,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab private void handleFingerprintAuthenticated(int authUserId, boolean isStrongBiometric) { Trace.beginSection("KeyGuardUpdateMonitor#handlerFingerPrintAuthenticated"); + if (mHandler.hasCallbacks(mFpCancelNotReceived)) { + Log.d(TAG, "handleFingerprintAuthenticated()" + + " triggered while waiting for cancellation, removing watchdog"); + mHandler.removeCallbacks(mFpCancelNotReceived); + } try { final int userId; try { |