From 8682faa273208121c7edaca8d40673419c49f187 Mon Sep 17 00:00:00 2001
From: Hao Dong <spdonghao@google.com>
Date: Mon, 19 Dec 2022 22:38:54 +0000
Subject: [PATCH] Fix cleaning up all unknown hal templates.

Bug: 261577256
Test: manually tested on device, testing steps:
      1. manually add more than one unknown HAL templates
      2. switch to another user
      3. all unknown HAL templates should be cleared
Change-Id: Ic45301ab15dd83cdd946411e5b0b227f843602cb
Merged-In: Ic45301ab15dd83cdd946411e5b0b227f843602cb
---
 .../server/biometrics/sensors/InternalCleanupClient.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/biometrics/sensors/InternalCleanupClient.java b/services/core/java/com/android/server/biometrics/sensors/InternalCleanupClient.java
index 57ea812dbb3a7..1924f3c929561 100644
--- a/services/core/java/com/android/server/biometrics/sensors/InternalCleanupClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/InternalCleanupClient.java
@@ -96,7 +96,11 @@ public abstract class InternalCleanupClient<S extends BiometricAuthenticator.Ide
         @Override
         public void onClientFinished(@NonNull BaseClientMonitor clientMonitor, boolean success) {
             Slog.d(TAG, "Remove onClientFinished: " + clientMonitor + ", success: " + success);
-            mCallback.onClientFinished(InternalCleanupClient.this, success);
+            if (mUnknownHALTemplates.isEmpty()) {
+                mCallback.onClientFinished(InternalCleanupClient.this, success);
+            } else {
+                startCleanupUnknownHalTemplates();
+            }
         }
     };