Merge "Inline IMMS#getCurIntentLocked" into main (4e7848cc) · Commits · e / os / android_frameworks_base

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

+5 −15

Original line number	Original line	Diff line number	Diff line
	@@ -561,16 +561,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
	@MultiUserUnawareField		@MultiUserUnawareField
	boolean mInFullscreenMode;		boolean mInFullscreenMode;

	/**
	* The Intent used to connect to the current input method.
	*/
	@GuardedBy("ImfLock.class")
	@Nullable
	private Intent getCurIntentLocked() {
	final var userData = mUserDataRepository.getOrCreate(mCurrentUserId);
	return userData.mBindingController.getCurIntent();
	}

	/**		/**
	* The token we have made for the currently active input method, to		* The token we have made for the currently active input method, to
	* identify it in the future.		* identify it in the future.
	@@ -3812,10 +3802,10 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
	if (mCurrentUserId != UserHandle.getUserId(uid)) {		if (mCurrentUserId != UserHandle.getUserId(uid)) {
	return false;		return false;
	}		}
	if (getCurIntentLocked() != null && InputMethodUtils.checkIfPackageBelongsToUid(		final var userData = mUserDataRepository.getOrCreate(mCurrentUserId);
	mPackageManagerInternal,		final var curIntent = userData.mBindingController.getCurIntent();
	uid,		if (curIntent != null && InputMethodUtils.checkIfPackageBelongsToUid(
	getCurIntentLocked().getComponent().getPackageName())) {		mPackageManagerInternal, uid, curIntent.getComponent().getPackageName())) {
	return true;		return true;
	}		}
	return false;		return false;
	@@ -5904,7 +5894,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
	p.println(" mCurToken=" + getCurTokenLocked());		p.println(" mCurToken=" + getCurTokenLocked());
	p.println(" mCurTokenDisplayId=" + mCurTokenDisplayId);		p.println(" mCurTokenDisplayId=" + mCurTokenDisplayId);
	p.println(" mCurHostInputToken=" + mAutofillController.getCurHostInputToken());		p.println(" mCurHostInputToken=" + mAutofillController.getCurHostInputToken());
	p.println(" mCurIntent=" + getCurIntentLocked());		p.println(" mCurIntent=" + userData.mBindingController.getCurIntent());
	method = getCurMethodLocked();		method = getCurMethodLocked();
	p.println(" mCurMethod=" + getCurMethodLocked());		p.println(" mCurMethod=" + getCurMethodLocked());
	p.println(" mEnabledSession=" + mEnabledSession);		p.println(" mEnabledSession=" + mEnabledSession);