Merge "AuthService registerFaceSensor for hidl should only focus on face... (e996ae8f) · Commits · e / os / android_frameworks_base

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

+20 −2

Original line number	Diff line number	Diff line
		@@ -850,10 +850,28 @@ public class AuthService extends SystemService {
		return;
		}

		boolean tempResetLockoutRequiresChallenge = false;

		if (hidlConfigStrings != null && hidlConfigStrings.length > 0) {
		for (String configString : hidlConfigStrings) {
		try {
		SensorConfig sensor = new SensorConfig(configString);
		switch (sensor.modality) {
		case BiometricAuthenticator.TYPE_FACE:
		tempResetLockoutRequiresChallenge = true;
		break;
		}
		} catch (Exception e) {
		Slog.e(TAG, "Error parsing configString: " + configString, e);
		}
		}
		}

		final boolean resetLockoutRequiresChallenge = tempResetLockoutRequiresChallenge;

		handlerProvider.getFaceHandler().post(() -> {
		final FaceSensorConfigurations mFaceSensorConfigurations =
		new FaceSensorConfigurations(hidlConfigStrings != null
		&& hidlConfigStrings.length > 0);
		new FaceSensorConfigurations(resetLockoutRequiresChallenge);

		if (hidlConfigStrings != null && hidlConfigStrings.length > 0) {
		mFaceSensorConfigurations.addHidlConfigs(hidlConfigStrings, context);