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

Commit 7e6060dc authored by Vincent Wang's avatar Vincent Wang Committed by Android (Google) Code Review
Browse files

Revert "Fix biometric context update problem." 

This reverts commit fcb4e264.

Reason for revert: The original CL can't fix bug, we will submit another CL for fixing bug.

Change-Id: I6dd591384117aedadf7803d279816e36674e7e28
parent fcb4e264

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