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

Commit bffc5f4b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix biometric context update problem."" into udc-qpr-dev am:... 

Merge "Revert "Fix biometric context update problem."" into udc-qpr-dev am: edb93221 am: ab771f95

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24291715



Change-Id: Idff06537f8e10d71eaab89ee5295435e23a1061b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bfe2e4e4 ab771f95

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