Merge "Prevent GenerateChallenge being dropped in some corner cases" (9afc8f90) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/biometrics/sensors/face/Face10.java

+9 −11

Original line number	Diff line number	Diff line
		@@ -519,21 +519,19 @@ class Face10 implements IHwBinder.DeathRecipient {
		@NonNull String opPackageName) {
		mHandler.post(() -> {
		if (mCurrentChallengeOwner != null) {
		Slog.w(TAG, "Current challenge owner: " + mCurrentChallengeOwner
		+ ", interrupted by: " + opPackageName);
		final ClientMonitorCallbackConverter listener =
		mCurrentChallengeOwner.getListener();
		if (listener == null) {
		Slog.w(TAG, "Null listener, skip sending interruption callback");
		return;
		}

		Slog.w(TAG, "Current challenge owner: " + mCurrentChallengeOwner
		+ ", listener: " + listener
		+ ", interrupted by: " + opPackageName);
		if (listener != null) {
		try {
		listener.onChallengeInterrupted(mSensorId);
		} catch (RemoteException e) {
		Slog.e(TAG, "Unable to notify challenge interrupted", e);
		}
		}
		}

		final FaceGenerateChallengeClient client = new FaceGenerateChallengeClient(mContext,
		mLazyDaemon, token, new ClientMonitorCallbackConverter(receiver), opPackageName,