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

Commit 44ce820c authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ic7c63f6babe47911d7f908da684a0cdf634ae658
parents 2e4ac8c7 390edd04

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

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

    protected void stopHalOperation() {

        UdfpsHelper.hideUdfpsOverlay(getSensorId(), mUdfpsOverlayController);

        if (mCancellationSignal != null) {

            try {

                mCancellationSignal.cancel();

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

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

            }

        } else {

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

        }

    }



    @Override