From 00399e4961738cb4f708956cfd155f8c307bff16 Mon Sep 17 00:00:00 2001
From: Shawn Lin <shawnlin@google.com>
Date: Wed, 31 Jul 2024 08:07:05 +0000
Subject: Re-add the loe flag with metadata

Rename flag and add BUGFIX metadata

Bug: 351036558
Test: atest FingerprintInternalCleanupClientTest
Flag: com.android.server.biometrics.Flags.FLAG_NOTIFY_FINGERPRINTS_LOE
Change-Id: I21d3246bc0f97081085eb31d599cf037577652d9
---
 services/core/java/com/android/server/biometrics/biometrics.aconfig  | 5 ++++-
 .../com/android/server/biometrics/sensors/InternalCleanupClient.java | 2 +-
 .../fingerprint/aidl/FingerprintInternalCleanupClientTest.java       | 2 +-
 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();
 
-- 
cgit v1.2.3-59-g8ed1b