Merge "Expose IMMI object for Proxy class" into main (0b6b3478) · Commits · e / os / android_frameworks_base

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

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -335,6 +335,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
	final Resources mRes;		final Resources mRes;
	private final Handler mHandler;		private final Handler mHandler;

			private final InputMethodManagerInternal mInputMethodManagerInternal;
	@NonNull		@NonNull
	private final Handler mIoHandler;		private final Handler mIoHandler;

	@@ -1131,6 +1132,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
	mHwController = new HandwritingModeController(mContext, uiLooper,		mHwController = new HandwritingModeController(mContext, uiLooper,
	new InkWindowInitializer(), discardDelegationTextRunnable);		new InkWindowInitializer(), discardDelegationTextRunnable);
	registerDeviceListenerAndCheckStylusSupport();		registerDeviceListenerAndCheckStylusSupport();
			mInputMethodManagerInternal = new LocalServiceImpl();
	}		}
	}		}

	@@ -5585,7 +5587,12 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
	}		}

	private void publishLocalService() {		private void publishLocalService() {
	LocalServices.addService(InputMethodManagerInternal.class, new LocalServiceImpl());		LocalServices.addService(InputMethodManagerInternal.class, mInputMethodManagerInternal);
			}

			// TODO(b/352228316): Remove it once IMMIProxy is removed.
			InputMethodManagerInternal getLocalService(){
			return mInputMethodManagerInternal;
	}		}

	private final class LocalServiceImpl extends InputMethodManagerInternal {		private final class LocalServiceImpl extends InputMethodManagerInternal {