Merge "Re-add the loe flag with metadata" into main

3 files changed, 6 insertions, 3 deletions

diff --git a/services/core/java/com/android/server/biometrics/biometrics.aconfig b/services/core/java/com/android/server/biometrics/biometrics.aconfig
index 15c88500210e..b2e95aa1cf28 100644
--- a/services/core/java/com/android/server/biometrics/biometrics.aconfig
+++ b/services/core/java/com/android/server/biometrics/biometrics.aconfig
@@ -16,8 +16,11 @@ flag {
 }
 
 flag {
-  name: "notify_fingerprint_loe"
+  name: "notify_fingerprints_loe"
   namespace: "biometrics_framework"
   description: "This flag controls whether a notification should be sent to notify user when loss of enrollment happens"
   bug: "351036558"
+  metadata {
+      purpose: PURPOSE_BUGFIX
+  }
 }
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 3b6aeef92421..77e27ba4df02 100644
--- a/services/core/java/com/android/server/biometrics/sensors/InternalCleanupClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/InternalCleanupClient.java
@@ -108,7 +108,7 @@ public abstract class InternalCleanupClient<S extends BiometricAuthenticator.Ide
             }
 
             if (mBiometricUtils.hasValidBiometricUserState(getContext(), getTargetUserId())
-                    && Flags.notifyFingerprintLoe()) {
+                    && Flags.notifyFingerprintsLoe()) {
                 handleInvalidBiometricState();
             }
         }
diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintInternalCleanupClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintInternalCleanupClientTest.java
index a34e7965ccee..242880ca49eb 100644
--- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintInternalCleanupClientTest.java
+++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintInternalCleanupClientTest.java
@@ -178,7 +178,7 @@ public class FingerprintInternalCleanupClientTest {
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_NOTIFY_FINGERPRINT_LOE)
+    @RequiresFlagsEnabled(Flags.FLAG_NOTIFY_FINGERPRINTS_LOE)
     public void invalidBiometricUserState() throws Exception {
         mClient =  createClient();