Merge "Revert "Fix biometric context update problem."" into udc-qpr-dev (edb93221) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java

+9 −6

Original line number	Diff line number	Diff line
		@@ -260,6 +260,14 @@ class FingerprintAuthenticationClient
		final AidlSession session = getFreshDaemon();

		final OperationContextExt opContext = getOperationContext();
		final ICancellationSignal cancel;
		if (session.hasContextMethods()) {
		cancel = session.getSession().authenticateWithContext(
		mOperationId, opContext.toAidlContext(getOptions()));
		} else {
		cancel = session.getSession().authenticate(mOperationId);
		}

		getBiometricContext().subscribe(opContext, ctx -> {
		if (session.hasContextMethods()) {
		try {
		@@ -281,12 +289,7 @@ class FingerprintAuthenticationClient
		mALSProbeCallback.getProbe().enable();
		}

		if (session.hasContextMethods()) {
		return session.getSession().authenticateWithContext(
		mOperationId, opContext.toAidlContext(getOptions()));
		} else {
		return session.getSession().authenticate(mOperationId);
		}
		return cancel;
		}

		@Override