Merge "Merge "Fixed NPE in FingerprintAuthClient" into sc-qpr1-dev am:... (4eadede9) · Commits · e / os / android_frameworks_base

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