Merge "Set pending client to null after timeout resumes" into rvc-dev am: a0222398c5 am: e923b5199e

Change-Id: I6c1c95b6a0f4ca9fa0a80a69b455cabff2e271f3
2020-04-08 20:19:02 +00:00
parent 461e560101 e923b5199e
commit 60452a2ca7
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
+++ b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
@@ -558,8 +558,10 @@ public abstract class BiometricServiceBase extends SystemService
            FrameworkStatsLog.write(FrameworkStatsLog.BIOMETRIC_SYSTEM_HEALTH_ISSUE_DETECTED,
                    statsModality(), BiometricsProtoEnums.ISSUE_CANCEL_TIMED_OUT);

+            ClientMonitor newClient = mPendingClient;
            mCurrentClient = null;
-            startClient(mPendingClient, false);
+            mPendingClient = null;
+            startClient(newClient, false);
        }
    }