Merge "[Identity Check] Replace negative text in bp if null" into main (27eae810) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -120,8 +120,10 @@ class PreAuthInfo {
		userId), trustManager)) {
		isMandatoryBiometricsAuthentication = true;
		promptInfo.setAuthenticators(BiometricManager.Authenticators.BIOMETRIC_STRONG);
		if (promptInfo.getNegativeButtonText() == null) {
		promptInfo.setNegativeButtonText(context.getString(R.string.cancel));
		}
		}

		final boolean biometricRequested = Utils.isBiometricRequested(promptInfo);
		final int requestedStrength = Utils.getPublicBiometricStrength(promptInfo);

+16 −0

Original line number	Diff line number	Diff line
		@@ -264,6 +264,22 @@ public class PreAuthInfoTest {
		assertThat(preAuthInfo.eligibleSensors).hasSize(0);
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_MANDATORY_BIOMETRICS)
		public void testMandatoryBiometricsNegativeButtonText_whenSet()
		throws Exception {
		when(mTrustManager.isInSignificantPlace()).thenReturn(false);

		final BiometricSensor sensor = getFaceSensor();
		final PromptInfo promptInfo = new PromptInfo();
		promptInfo.setAuthenticators(BiometricManager.Authenticators.MANDATORY_BIOMETRICS);
		promptInfo.setNegativeButtonText(TEST_PACKAGE_NAME);
		final PreAuthInfo preAuthInfo = PreAuthInfo.create(mTrustManager, mDevicePolicyManager,
		mSettingObserver, List.of(sensor), 0 /* userId */, promptInfo, TEST_PACKAGE_NAME,
		false /* checkDevicePolicyManager */, mContext, mBiometricCameraManager);
		assertThat(promptInfo.getNegativeButtonText()).isEqualTo(TEST_PACKAGE_NAME);
		}

		private BiometricSensor getFingerprintSensor() {
		BiometricSensor sensor = new BiometricSensor(mContext, SENSOR_ID_FINGERPRINT,
		TYPE_FINGERPRINT, BiometricManager.Authenticators.BIOMETRIC_STRONG,