commit 06a95017d40fcea300db04f474564f49389b072c
author joshmccloskey <joshmccloskey@google.com> Mon Mar 30 16:04:15 2020 -0700
committer Joshua Mccloskey <joshmccloskey@google.com> Wed Apr 08 08:06:39 2020 +0000
tree 7d739e748c1db82c348ad6d19390e8f8edd9ef36
parent 4406aac0cc4bdb377ee1ff29dd4d4954245a01ad

Set pending client to null after timeout resumes

Bug: 148867568
Test: manual.
Change-Id: I6bd97ecb57ddc2a7e1ccdf9c84bb895f372b2358
(cherry picked from commit d04d6d51a06afe0d3c48030baccced551f4a81d7)

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