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

Commit 36eb78e7 authored by Ilya Matyukhin's avatar Ilya Matyukhin Committed by Automerger Merge Worker
Browse files

Merge "Merge "Fixed NPE in FingerprintAuthClient" into sc-qpr1-dev am:... 

Merge "Merge "Fixed NPE in FingerprintAuthClient" into sc-qpr1-dev am: 390edd04 am: 44ce820c" into sc-v2-dev-plus-aosp am: 4eadede9

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

Change-Id: Ife607f6e922c8e9817d2773bca5f8dca9ca200e3
parents bb3b0c9f 4eadede9

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

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

    protected void stopHalOperation() {

        mSensorOverlays.hide(getSensorId());



        if (mCancellationSignal != null) {

            try {

                mCancellationSignal.cancel();

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

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

            }

        } else {

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

        }

    }



    @Override