Merge "Move up the check if the editor belongs to the current user" into main (4b6b9b8f) · Commits · e / os / android_frameworks_base

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

+7 −6

Original line number	Diff line number	Diff line
		@@ -2385,12 +2385,6 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
		@StartInputReason int startInputReason,
		int unverifiedTargetSdkVersion,
		@NonNull ImeOnBackInvokedDispatcher imeDispatcher) {
		if (!InputMethodUtils.checkIfPackageBelongsToUid(mPackageManagerInternal, cs.mUid,
		editorInfo.packageName)) {
		Slog.e(TAG, "Rejecting this client as it reported an invalid package name."
		+ " uid=" + cs.mUid + " package=" + editorInfo.packageName);
		return InputBindResult.INVALID_PACKAGE_NAME;
		}

		// Compute the final shown display ID with validated cs.selfReportedDisplayId for this
		// session & other conditions.
		@@ -3763,6 +3757,13 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
		return InputBindResult.INVALID_USER;
		}

		if (editorInfo != null && !InputMethodUtils.checkIfPackageBelongsToUid(
		mPackageManagerInternal, cs.mUid, editorInfo.packageName)) {
		Slog.e(TAG, "Rejecting this client as it reported an invalid package name."
		+ " uid=" + cs.mUid + " package=" + editorInfo.packageName);
		return InputBindResult.INVALID_PACKAGE_NAME;
		}

		result = startInputOrWindowGainedFocusInternalLocked(startInputReason,
		client, windowToken, startInputFlags, softInputMode, windowFlags,
		editorInfo, inputConnection, remoteAccessibilityInputConnection,