Merge changes from topic "b204906124-sc" into sc-mainline-prod (bc73d79c) · Commits · e / os / android_frameworks_base

core/java/android/view/inputmethod/InputMethodManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2957,7 +2957,7 @@ public final class InputMethodManager {
		@UnsupportedAppUsage
		public int getInputMethodWindowVisibleHeight() {
		try {
		return mService.getInputMethodWindowVisibleHeight();
		return mService.getInputMethodWindowVisibleHeight(mClient);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

core/java/com/android/internal/view/IInputMethodManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ interface IInputMethodManager {
		void setAdditionalInputMethodSubtypes(String id, in InputMethodSubtype[] subtypes);
		// This is kept due to @UnsupportedAppUsage.
		// TODO(Bug 113914148): Consider removing this.
		int getInputMethodWindowVisibleHeight();
		int getInputMethodWindowVisibleHeight(in IInputMethodClient client);

		oneway void reportPerceptibleAsync(in IBinder windowToken, boolean perceptible);
		/** Remove the IME surface. Requires INTERNAL_SYSTEM_WINDOW permission. */

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

+52 −18

Original line number	Diff line number	Diff line
		@@ -124,6 +124,7 @@ import android.util.Pair;
		import android.util.PrintWriterPrinter;
		import android.util.Printer;
		import android.util.Slog;
		import android.util.SparseBooleanArray;
		import android.util.imetracing.ImeTracing;
		import android.util.proto.ProtoOutputStream;
		import android.view.IWindowManager;
		@@ -300,6 +301,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		final InputMethodSettings mSettings;
		final SettingsObserver mSettingsObserver;
		final IWindowManager mIWindowManager;
		private final SparseBooleanArray mLoggedDeniedGetInputMethodWindowVisibleHeightForUid =
		new SparseBooleanArray(0);
		final WindowManagerInternal mWindowManagerInternal;
		final PackageManagerInternal mPackageManagerInternal;
		final InputManagerInternal mInputManagerInternal;
		@@ -1334,6 +1337,13 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		clearPackageChangeState();
		}

		@Override
		public void onUidRemoved(int uid) {
		synchronized (mMethodMap) {
		mLoggedDeniedGetInputMethodWindowVisibleHeightForUid.delete(uid);
		}
		}

		private void clearPackageChangeState() {
		// No need to lock them because we access these fields only on getRegisteredHandler().
		mChangedPackages.clear();
		@@ -3061,22 +3071,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		}
		final long ident = Binder.clearCallingIdentity();
		try {
		if (mCurClient == null \|\| client == null
		\|\| mCurClient.client.asBinder() != client.asBinder()) {
		// We need to check if this is the current client with
		// focus in the window manager, to allow this call to
		// be made before input is started in it.
		final ClientState cs = mClients.get(client.asBinder());
		if (cs == null) {
		throw new IllegalArgumentException(
		"unknown client " + client.asBinder());
		}
		if (!mWindowManagerInternal.isInputMethodClientFocus(cs.uid, cs.pid,
		cs.selfReportedDisplayId)) {
		Slog.w(TAG, "Ignoring showSoftInput of uid " + uid + ": " + client);
		if (!canInteractWithImeLocked(uid, client, "showSoftInput")) {
		return false;
		}
		}
		if (DEBUG) Slog.v(TAG, "Client requesting input be shown");
		return showCurrentInputLocked(windowToken, flags, resultReceiver, reason);
		} finally {
		@@ -3900,9 +3897,46 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
		* @return {@link WindowManagerInternal#getInputMethodWindowVisibleHeight(int)}
		*/
		@Override
		public int getInputMethodWindowVisibleHeight() {
		// TODO(yukawa): Should we verify the display ID?
		return mWindowManagerInternal.getInputMethodWindowVisibleHeight(mCurTokenDisplayId);
		@Deprecated
		public int getInputMethodWindowVisibleHeight(@NonNull IInputMethodClient client) {
		int callingUid = Binder.getCallingUid();
		return Binder.withCleanCallingIdentity(() -> {
		final int curTokenDisplayId;
		synchronized (mMethodMap) {
		if (!canInteractWithImeLocked(callingUid, client,
		"getInputMethodWindowVisibleHeight")) {
		if (!mLoggedDeniedGetInputMethodWindowVisibleHeightForUid.get(callingUid)) {
		EventLog.writeEvent(0x534e4554, "204906124", callingUid, "");
		mLoggedDeniedGetInputMethodWindowVisibleHeightForUid.put(callingUid, true);
		}
		return 0;
		}
		// This should probably use the caller's display id, but because this is unsupported
		// and maintained only for compatibility, there's no point in fixing it.
		curTokenDisplayId = mCurTokenDisplayId;
		}
		return mWindowManagerInternal.getInputMethodWindowVisibleHeight(curTokenDisplayId);
		});
		}

		private boolean canInteractWithImeLocked(int callingUid, IInputMethodClient client,
		String method) {
		if (mCurClient == null \|\| client == null
		\|\| mCurClient.client.asBinder() != client.asBinder()) {
		// We need to check if this is the current client with
		// focus in the window manager, to allow this call to
		// be made before input is started in it.
		final ClientState cs = mClients.get(client.asBinder());
		if (cs == null) {
		throw new IllegalArgumentException("unknown client " + client.asBinder());
		}
		if (!mWindowManagerInternal.isInputMethodClientFocus(cs.uid, cs.pid,
		cs.selfReportedDisplayId)) {
		Slog.w(TAG, "Ignoring " + method + " of uid " + callingUid + ": " + client);
		return false;
		}
		}
		return true;
		}

		@Override

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1803,7 +1803,7 @@ public final class MultiClientInputMethodManagerService {

		@BinderThread
		@Override
		public int getInputMethodWindowVisibleHeight() {
		public int getInputMethodWindowVisibleHeight(IInputMethodClient client) {
		reportNotSupported();
		return 0;
		}