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

Commit 690ad8f4 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [15981390, 15981677, 15981678, 15981679, 15981680,... 

Merge cherrypicks of [15981390, 15981677, 15981678, 15981679, 15981680, 15981894] into sc-d1-release

Change-Id: I966003b3721c2a357f2dff76bd0d6594e321075a
parents 68ce14ff 6fbf6cbe

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

+11 −7
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ class FingerprintAuthenticationClient extends AuthenticationClient<ISession> imp 
    @Override

    protected void stopHalOperation() {

        UdfpsHelper.hideUdfpsOverlay(getSensorId(), mUdfpsOverlayController);

        if (mCancellationSignal != null) {

            try {

                mCancellationSignal.cancel();

            } catch (RemoteException e) {
@@ -172,6 +173,9 @@ class FingerprintAuthenticationClient extends AuthenticationClient<ISession> imp 
                        0 /* vendorCode */);

                mCallback.onClientFinished(this, false /* success */);

            }

        } else {

            Slog.e(TAG, "cancellation signal was null");

        }

    }



    @Override