From 06a95017d40fcea300db04f474564f49389b072c Mon Sep 17 00:00:00 2001
From: joshmccloskey <joshmccloskey@google.com>
Date: Mon, 30 Mar 2020 16:04:15 -0700
Subject: [PATCH] Set pending client to null after timeout resumes

Bug: 148867568
Test: manual.
Change-Id: I6bd97ecb57ddc2a7e1ccdf9c84bb895f372b2358
(cherry picked from commit d04d6d51a06afe0d3c48030baccced551f4a81d7)
---
 .../com/android/server/biometrics/BiometricServiceBase.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/biometrics/BiometricServiceBase.java b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
index 4431abe431363..808f8c21cc8de 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 @@ 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);
         }
     }