Merge "ZeroJankProxy: Fix system_server crash when on bad app calls." into main (f1d202bd) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/inputmethod/ZeroJankProxy.java

+2 −8

Original line number	Diff line number	Diff line
		@@ -101,7 +101,6 @@ public class ZeroJankProxy extends IInputMethodManager.Stub {
		}

		private void offloadInner(Runnable r) {
		boolean useThrowingRunnable = r instanceof ThrowingRunnable;
		final long identity = Binder.clearCallingIdentity();
		try {
		mExecutor.execute(() -> {
		@@ -110,14 +109,9 @@ public class ZeroJankProxy extends IInputMethodManager.Stub {
		Binder.restoreCallingIdentity(identity);
		try {
		try {
		if (useThrowingRunnable) {
		((ThrowingRunnable) r).runOrThrow();
		} else {
		r.run();
		}
		} catch (Exception e) {
		Slog.e(TAG, "Error in async call", e);
		throw ExceptionUtils.propagate(e);
		Slog.e(TAG, "Error in async IMMS call", e);
		}
		} finally {
		Binder.restoreCallingIdentity(inner);