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

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

Merge "Flag removal Remove notify_fingerprints_loe flag" into main

parents f3fddea5 4a303903

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

+0 −10
Original line number Diff line number Diff line
@@ -15,16 +15,6 @@ flag { 
  bug: "294254230"

}



flag {

  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

  }

}



flag {

  name: "set_ignore_speed_up"

  namespace: "biometrics_framework"

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

+2 −5
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.util.Slog; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.server.biometrics.BiometricsProto;

import com.android.server.biometrics.Flags;

import com.android.server.biometrics.log.BiometricContext;

import com.android.server.biometrics.log.BiometricLogger;
@@ -108,8 +107,7 @@ public abstract class InternalCleanupClient<S extends BiometricAuthenticator.Ide 
                }

            }



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

                    && Flags.notifyFingerprintsLoe()) {

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

                handleInvalidBiometricState();

            }

        }
@@ -164,8 +162,7 @@ public abstract class InternalCleanupClient<S extends BiometricAuthenticator.Ide 


        getLogger().logUnknownEnrollmentInHal();



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

                && Flags.notifyFingerprintsLoe()) {

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

            getLogger().logFingerprintsLoe();

        }

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

+0 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.hardware.biometrics.fingerprint.ISession; 
import android.hardware.fingerprint.Fingerprint;

import android.os.RemoteException;

import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.testing.TestableContext;
@@ -41,7 +40,6 @@ import androidx.annotation.NonNull; 
import androidx.test.filters.SmallTest;

import androidx.test.platform.app.InstrumentationRegistry;



import com.android.server.biometrics.Flags;

import com.android.server.biometrics.log.BiometricContext;

import com.android.server.biometrics.log.BiometricLogger;

import com.android.server.biometrics.sensors.ClientMonitorCallback;
@@ -180,7 +178,6 @@ public class FingerprintInternalCleanupClientTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_NOTIFY_FINGERPRINTS_LOE)

    public void invalidBiometricUserState() throws Exception {

        mClient =  createClient();