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

Commit 4f95fe95 authored by Vincent Wang's avatar Vincent Wang Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I1fdf41dbbad737bd0bc0e22a109e502598b41a4e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ade5fd73 67e5d550

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

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

        final AidlSession session = getFreshDaemon();





        final OperationContextExt opContext = getOperationContext();

        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 -> {

        getBiometricContext().subscribe(opContext, ctx -> {

            if (session.hasContextMethods()) {

            if (session.hasContextMethods()) {

                try {

                try {
@@ -289,7 +281,12 @@ class FingerprintAuthenticationClient 
            mALSProbeCallback.getProbe().enable();

            mALSProbeCallback.getProbe().enable();

        }

        }





        return cancel;

        if (session.hasContextMethods()) {

            return session.getSession().authenticateWithContext(

                    mOperationId, opContext.toAidlContext(getOptions()));

        } else {

            return session.getSession().authenticate(mOperationId);

        }

    }

    }





    @Override

    @Override