summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Antonio Kantek <kanant@google.com> 2024-07-10 09:45:01 -0700
committer Antonio Kantek <kanant@google.com> 2024-07-11 11:05:11 -0700
commit69fb307954b7a53cbe66bc76ad26eb94c70592b1 (patch)
treea6e71544b64b6187b1898bbf291235bd6832f79f
parent4ea531e7640483125b0686652069cec61b7aec63 (diff)
Dump IMMS#mConcurrentMultiUserModeEnabled
This field indicates if IMMS is configured for concurrent multi-user operation. The code change is a refactoring and should not cause visible issues. Bug: 351912418 Test: m Test: adb shell dumpsys input_method | grep mConcurrentMultiUserModeEnabled Test: adb shell dumpsys input_method --proto > input_method.proto && gqui from rawproto:input_method.proto --outfile=input_method.text Flag: EXEMPT refactor Change-Id: I124711ba1632ec85b1c56872b8ace6c5e308f12e
-rw-r--r--core/proto/android/server/inputmethod/inputmethodmanagerservice.proto3
-rw-r--r--services/core/java/com/android/server/inputmethod/InputMethodManagerService.java3
2 files changed, 5 insertions, 1 deletions
diff --git a/core/proto/android/server/inputmethod/inputmethodmanagerservice.proto b/core/proto/android/server/inputmethod/inputmethodmanagerservice.proto
index b75d545b1305..eddf1d276e4b 100644
--- a/core/proto/android/server/inputmethod/inputmethodmanagerservice.proto
+++ b/core/proto/android/server/inputmethod/inputmethodmanagerservice.proto
@@ -47,4 +47,5 @@ message InputMethodManagerServiceProto {
optional int32 ime_window_visibility = 22;
optional bool show_ime_with_hard_keyboard = 23;
optional bool accessibility_requesting_no_soft_keyboard = 24;
-} \ No newline at end of file
+ optional bool concurrent_multi_user_mode_enabled = 25;
+}
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index 0dbaaf398e00..4d8d48023715 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -26,6 +26,7 @@ import static android.provider.Settings.Secure.STYLUS_HANDWRITING_DEFAULT_VALUE;
import static android.provider.Settings.Secure.STYLUS_HANDWRITING_ENABLED;
import static android.server.inputmethod.InputMethodManagerServiceProto.BACK_DISPOSITION;
import static android.server.inputmethod.InputMethodManagerServiceProto.BOUND_TO_METHOD;
+import static android.server.inputmethod.InputMethodManagerServiceProto.CONCURRENT_MULTI_USER_MODE_ENABLED;
import static android.server.inputmethod.InputMethodManagerServiceProto.CUR_ATTRIBUTE;
import static android.server.inputmethod.InputMethodManagerServiceProto.CUR_CLIENT;
import static android.server.inputmethod.InputMethodManagerServiceProto.CUR_FOCUSED_WINDOW_SOFT_INPUT_MODE;
@@ -4558,6 +4559,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
proto.write(BACK_DISPOSITION, bindingController.getBackDisposition());
proto.write(IME_WINDOW_VISIBILITY, bindingController.getImeWindowVis());
proto.write(SHOW_IME_WITH_HARD_KEYBOARD, mMenuController.getShowImeWithHardKeyboard());
+ proto.write(CONCURRENT_MULTI_USER_MODE_ENABLED, mConcurrentMultiUserModeEnabled);
proto.end(token);
}
}
@@ -6006,6 +6008,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
final InputMethodSettings settings = InputMethodSettingsRepository.get(userId);
final var userData = getUserData(userId);
p.println("Current Input Method Manager state:");
+ p.println(" concurrentMultiUserModeEnabled" + mConcurrentMultiUserModeEnabled);
final List<InputMethodInfo> methodList = settings.getMethodList();
int numImes = methodList.size();
p.println(" Input Methods:");