Merge "Remove flag android.adaptiveauth.report_biometric_auth_attempts" into main (1ea630b3) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+0 −15

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ aconfig_declarations_group {
		"aconfig_settingslib_flags_java_lib",
		"aconfig_trade_in_mode_flags_java_lib",
		"adpf_flags_java_lib",
		"android.adaptiveauth.flags-aconfig-java",
		"android.app.appfunctions.flags-aconfig-java",
		"android.app.assist.flags-aconfig-java",
		"android.app.contextualsearch.flags-aconfig-java",
		@@ -1665,20 +1664,6 @@ java_aconfig_library {
		min_sdk_version: "30",
		}

		// Adaptive Auth
		aconfig_declarations {
		name: "android.adaptiveauth.flags-aconfig",
		package: "android.adaptiveauth",
		container: "system",
		srcs: ["core/java/android/adaptiveauth/*.aconfig"],
		}

		java_aconfig_library {
		name: "android.adaptiveauth.flags-aconfig-java",
		aconfig_declarations: "android.adaptiveauth.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// CrashRecovery Module
		aconfig_declarations {
		name: "android.crashrecovery.flags-aconfig",

deleted100644 → 0

+0 −9

Original line number	Diff line number	Diff line
		package: "android.adaptiveauth"
		container: "system"

		flag {
		name: "report_biometric_auth_attempts"
		namespace: "biometrics"
		description: "Control the usage of the biometric auth signal in adaptive auth"
		bug: "285053096"
		}
		No newline at end of file

+10 −13

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.server.biometrics.sensors.face.aidl;

		import static android.adaptiveauth.Flags.reportBiometricAuthAttempts;
		import static android.hardware.biometrics.BiometricFaceConstants.FACE_ACQUIRED_NOT_DETECTED;
		import static android.hardware.biometrics.BiometricFaceConstants.FACE_ACQUIRED_SENSOR_DIRTY;
		import static android.hardware.biometrics.BiometricFaceConstants.FACE_ACQUIRED_UNKNOWN;
		@@ -270,7 +269,6 @@ public class FaceAuthenticationClient
		0 /* vendorError */,
		getTargetUserId()));

		if (reportBiometricAuthAttempts()) {
		if (authenticated) {
		mAuthenticationStateListeners.onAuthenticationSucceeded(
		new AuthenticationSucceededInfo.Builder(BiometricSourceType.FACE,
		@@ -283,7 +281,6 @@ public class FaceAuthenticationClient
		);
		}
		}
		}

		@Override
		public void onError(@BiometricConstants.Errors int error, int vendorCode) {

+8 −13

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.server.biometrics.sensors.fingerprint.aidl;

		import static android.adaptiveauth.Flags.reportBiometricAuthAttempts;
		import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_VENDOR;
		import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_VENDOR_BASE;
		import static android.hardware.fingerprint.FingerprintManager.getAcquiredString;
		@@ -182,25 +181,21 @@ public class FingerprintAuthenticationClient
		if (authenticated) {
		mState = STATE_STOPPED;
		mSensorOverlays.hide(getSensorId());
		if (reportBiometricAuthAttempts()) {
		mAuthenticationStateListeners.onAuthenticationSucceeded(
		new AuthenticationSucceededInfo.Builder(BiometricSourceType.FINGERPRINT,
		getRequestReason(), mIsStrongBiometric, getTargetUserId()).build()
		);
		}
		mAuthenticationStateListeners.onAuthenticationStopped(new AuthenticationStoppedInfo
		.Builder(BiometricSourceType.FINGERPRINT, getRequestReason()).build()
		);
		} else {
		mState = STATE_STARTED_PAUSED_ATTEMPTED;
		if (reportBiometricAuthAttempts()) {
		mAuthenticationStateListeners.onAuthenticationFailed(new AuthenticationFailedInfo
		.Builder(BiometricSourceType.FINGERPRINT, getRequestReason(),
		getTargetUserId()).build()
		);
		}
		}
		}

		private void handleLockout(boolean authenticated) {
		if (getLockoutTracker() == null) {

+0 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.server.biometrics;
		import static android.Manifest.permission.MANAGE_BIOMETRIC;
		import static android.Manifest.permission.TEST_BIOMETRIC;
		import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL;
		import static android.adaptiveauth.Flags.FLAG_REPORT_BIOMETRIC_AUTH_ATTEMPTS;
		import static android.hardware.biometrics.BiometricAuthenticator.TYPE_NONE;
		import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_ERROR_CANCELED;
		import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_SUCCESS;
		@@ -475,7 +474,6 @@ public class AuthServiceTest {

		@Test
		public void testRegisterAuthenticationStateListener_callsFaceService() throws Exception {
		mSetFlagsRule.enableFlags(FLAG_REPORT_BIOMETRIC_AUTH_ATTEMPTS);
		setInternalAndTestBiometricPermissions(mContext, true /* hasPermission */);

		mAuthService = new AuthService(mContext, mInjector);