Merge "Revert "Track update count of IMMS#mMethodMap"" into main (e10c3b76) · Commits · e / os / android_frameworks_base

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

+1 −8

Original line number	Diff line number	Diff line
		@@ -382,12 +382,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		@MultiUserUnawareField
		private HardwareKeyboardShortcutController mHardwareKeyboardShortcutController;

		/**
		* Tracks how many times {@link #mSettings} was updated.
		*/
		@GuardedBy("ImfLock.class")
		private int mMethodMapUpdateCount = 0;

		@GuardedBy("ImfLock.class")
		@MultiUserUnawareField
		private int mDeviceIdToShowIme = DEVICE_ID_DEFAULT;
		@@ -5246,7 +5240,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		Slog.e(TAG, "buildInputMethodListLocked is not allowed until system is ready");
		return;
		}
		mMethodMapUpdateCount++;

		final InputMethodSettings settings = InputMethodSettingsRepository.get(mCurrentUserId);

		@@ -6072,7 +6065,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		p.println("Current Input Method Manager state:");
		final List<InputMethodInfo> methodList = settings.getMethodList();
		int numImes = methodList.size();
		p.println(" Input Methods: mMethodMapUpdateCount=" + mMethodMapUpdateCount);
		p.println(" Input Methods:");
		for (int i = 0; i < numImes; i++) {
		InputMethodInfo info = methodList.get(i);
		p.println(" InputMethod #" + i + ":");