From a5ae7ebb95e446f48f0480341eff5134489a820b Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Wed, 10 Feb 2021 18:39:29 -0800
Subject: [PATCH] Go to STATE_AUTH_STARTED_UI_SHOWING if UI was already showing

This can happen if the retry button was pressed

Bug: 179955752
Test: atest CtsBiometricsTestCases
Test: atest com.android.server.biometrics
Change-Id: Id632da3c13c81f8eee905cf0f00e7cb8cfaabaf3
---
 .../java/com/android/server/biometrics/AuthSession.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/biometrics/AuthSession.java b/services/core/java/com/android/server/biometrics/AuthSession.java
index c9560437799e2..f37fbf59af39e 100644
--- a/services/core/java/com/android/server/biometrics/AuthSession.java
+++ b/services/core/java/com/android/server/biometrics/AuthSession.java
@@ -257,11 +257,15 @@ public final class AuthSession implements IBinder.DeathRecipient {
                             mUserId,
                             mOpPackageName,
                             mOperationId);
+                    mState = STATE_AUTH_STARTED;
                 } catch (RemoteException e) {
                     Slog.e(TAG, "Remote exception", e);
                 }
+            } else {
+                // The UI was already showing :)
+                mState = STATE_AUTH_STARTED_UI_SHOWING;
             }
-            mState = STATE_AUTH_STARTED;
+
         }
     }