Add biometric strength reset and fix CTS tests on multi sensor devices (mostly)

Tests can still fail due to flakiness in cleanup (main cause seems to be stale enrollments).

Fix: 187250205
Test: atest CtsBiometricsTestCases

Change-Id: I3e379322277cde984f5a0112d38db60b9c6e360d

1 files changed, 6 insertions, 1 deletions

diff --git a/core/java/android/hardware/biometrics/BiometricTestSession.java b/core/java/android/hardware/biometrics/BiometricTestSession.java
index 41672b7cbaea..c62680f7354e 100644
--- a/core/java/android/hardware/biometrics/BiometricTestSession.java
+++ b/core/java/android/hardware/biometrics/BiometricTestSession.java
@@ -23,7 +23,6 @@ import android.annotation.Nullable;
 import android.annotation.RequiresPermission;
 import android.annotation.TestApi;
 import android.content.Context;
-import android.hardware.fingerprint.FingerprintManager;
 import android.os.RemoteException;
 import android.util.ArraySet;
 import android.util.Log;
@@ -248,6 +247,12 @@ public class BiometricTestSession implements AutoCloseable {
             }
         }
 
+        if (!mUsersCleaningUp.isEmpty()) {
+            // TODO(b/186600837): this seems common on multi sensor devices
+            Log.e(getTag(), "Cleanup not finished before shutdown - pending: "
+                    + mUsersCleaningUp.size());
+        }
+
         // Disable the test HAL after the sensor becomes idle.
         setTestHalEnabled(false);
     }