Revert "Track update count of IMMS#mMethodMap"
This reverts commit e073306d7788dd14aa8b6bd24304a18dece7c084 [1].
Reason for revert:
This field is not so useful any more, especially after we started
offloading slow disk read operations to a worker thread without
requiring ImfLock [2][3].
Let's simplify this unused field in favor of simplicity.
[1]: I05850578cbf2e6adfea6c7e9b1fb9ec4e9d5e2c9
[2]: I263cd49dd4d64b64136acc3dad469f83a862ce97
db19711e043340805ea94548ed31012122d913a6
[3]: Icc84fe9d0d3b5842b4d5ee51b12b0d3cd10a1d24
81a9a1ba6647bf6698075db49c9667153eb6eb5b
Bug: 32343335
Bug: 340221861
Bug: 343601565
Test: presubmit
Flag: EXEMPT refactor
Change-Id: I424b2bab3921d0354638df40877b94449e5b7af8
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index 48d0174..d4aa683 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -367,12 +367,6 @@
@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;
@@ -5218,7 +5212,6 @@
Slog.e(TAG, "buildInputMethodListLocked is not allowed until system is ready");
return;
}
- mMethodMapUpdateCount++;
final InputMethodSettings settings = InputMethodSettingsRepository.get(mCurrentUserId);
@@ -6044,7 +6037,7 @@
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 + ":");