Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 664ed482 authored by Shawn Lin's avatar Shawn Lin Committed by Android (Google) Code Review
Browse files

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

parents d48b296b 00399e49

services/core/java/com/android/server/biometrics/biometrics.aconfig

+4 −1
Original line number Diff line number Diff line
@@ -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

  }

}

services/core/java/com/android/server/biometrics/sensors/InternalCleanupClient.java

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public abstract class InternalCleanupClient<S extends BiometricAuthenticator.Ide 
            }



            if (mBiometricUtils.hasValidBiometricUserState(getContext(), getTargetUserId())

                    && Flags.notifyFingerprintLoe()) {

                    && Flags.notifyFingerprintsLoe()) {

                handleInvalidBiometricState();

            }

        }

services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintInternalCleanupClientTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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();