Merge "Inline InputMethodBindingController#addFreshWindowToken()" into main (ad5cda01) · Commits · e / os / android_frameworks_base

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

+10 −17

Original line number	Diff line number	Diff line
		@@ -443,7 +443,16 @@ final class InputMethodBindingController {
		mCurId = info.getId();
		mLastBindTime = SystemClock.uptimeMillis();

		addFreshWindowToken();
		final int displayIdToShowIme = mService.getDisplayIdToShowImeLocked();
		mCurToken = new Binder();
		mService.setCurTokenDisplayIdLocked(displayIdToShowIme);
		if (DEBUG) {
		Slog.v(TAG, "Adding window token: " + mCurToken + " for display: "
		+ displayIdToShowIme);
		}
		mWindowManagerInternal.addWindowToken(mCurToken,
		WindowManager.LayoutParams.TYPE_INPUT_METHOD,
		displayIdToShowIme, null /* options */);
		return new InputBindResult(
		InputBindResult.ResultCode.SUCCESS_WAITING_IME_BINDING,
		null, null, null, mCurId, mCurSeq, false);
		@@ -470,22 +479,6 @@ final class InputMethodBindingController {
		return intent;
		}

		@GuardedBy("ImfLock.class")
		private void addFreshWindowToken() {
		int displayIdToShowIme = mService.getDisplayIdToShowImeLocked();
		mCurToken = new Binder();

		mService.setCurTokenDisplayIdLocked(displayIdToShowIme);

		if (DEBUG) {
		Slog.v(TAG, "Adding window token: " + mCurToken + " for display: "
		+ displayIdToShowIme);
		}
		mWindowManagerInternal.addWindowToken(mCurToken,
		WindowManager.LayoutParams.TYPE_INPUT_METHOD,
		displayIdToShowIme, null /* options */);
		}

		@GuardedBy("ImfLock.class")
		private void unbindMainConnection() {
		mContext.unbindService(mMainConnection);