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

Commit 9a8276a4 authored by Joshua Mccloskey's avatar Joshua Mccloskey
Browse files

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

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

Change-Id: I22ec1fc667d4ff7ce49afb9d32c567e170456874
Merged-In: I2f946cae240009af6963284c54825ab7b5efcc40
parents 32e9cec8 44ce820c

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

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

    protected void stopHalOperation() {

        mSensorOverlays.hide(getSensorId());



        if (mCancellationSignal != null) {

            try {

                mCancellationSignal.cancel();

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

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

            }

        } else {

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

        }

    }



    @Override