Merge "[Stability][Bugfix] Catch DeadObjectException in TCMS." (8c93a720) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -527,12 +527,13 @@ public final class TextClassificationManagerService extends ITextClassifierServi
		callback.onFailure();
		return;
		}
		textClassifierServiceConsumer.accept(serviceState.mService);
		consumeServiceNoExceptLocked(textClassifierServiceConsumer, serviceState.mService);
		} else {
		serviceState.mPendingRequests.add(
		new PendingRequest(
		methodName,
		() -> textClassifierServiceConsumer.accept(serviceState.mService),
		() -> consumeServiceNoExceptLocked(
		textClassifierServiceConsumer, serviceState.mService),
		callback::onFailure, callback.asBinder(),
		this,
		serviceState,
		@@ -541,6 +542,16 @@ public final class TextClassificationManagerService extends ITextClassifierServi
		}
		}

		private static void consumeServiceNoExceptLocked(
		@NonNull ThrowingConsumer<ITextClassifierService> textClassifierServiceConsumer,
		@Nullable ITextClassifierService service) {
		try {
		textClassifierServiceConsumer.accept(service);
		} catch (RuntimeException \| Error e) {
		Slog.e(LOG_TAG, "Exception when consume textClassifierService: " + e);
		}
		}

		private static ITextClassifierCallback wrap(ITextClassifierCallback orig) {
		return new CallbackWrapper(orig);
		}