commit a0222398c5c3bca35bc13405d489d04c63fd232f
author Joshua Mccloskey <joshmccloskey@google.com> Wed Apr 08 19:58:19 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 08 19:58:19 2020 +0000
tree 7ad6aeb103f45836a43454cd94f03dcc933f82dc
parent 9b2931e9734936e9f4e29472cb7aa2f5bf4b2a07
parent 06a95017d40fcea300db04f474564f49389b072c

Merge "Set pending client to null after timeout resumes" into rvc-dev

services/core/java/com/android/server/biometrics/BiometricServiceBase.java

diff --git a/services/core/java/com/android/server/biometrics/BiometricServiceBase.java b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
index 4431abe..808f8c21 100644
--- a/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
+++ b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
@@ -558,8 +558,10 @@
             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);
         }
     }