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

Commit c7cc5b86 authored by Joshua Mccloskey's avatar Joshua Mccloskey
Browse files

Fixed NPE in FingerprintAuthClient 

Test: It builds.
Bug: 193883067

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: I2f946cae240009af6963284c54825ab7b5efcc40
parent 316587fa

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

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

    @Override

    protected void stopHalOperation() {

    protected void stopHalOperation() {

        mSensorOverlays.hide(getSensorId());

        mSensorOverlays.hide(getSensorId());



        if (mCancellationSignal != null) {

            try {

            try {

                mCancellationSignal.cancel();

                mCancellationSignal.cancel();

            } catch (RemoteException e) {

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

                        0 /* vendorCode */);

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

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

            }

            }

        } else {

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

        }

    }

    }





    @Override

    @Override