Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 550939dc authored by Antonio Kantek's avatar Antonio Kantek Committed by Android (Google) Code Review
Browse files

Merge "Dump IMMS#mConcurrentMultiUserModeEnabled" into main

parents 3a1b19d8 69fb3079

core/proto/android/server/inputmethod/inputmethodmanagerservice.proto

+2 −1
Original line number Diff line number Diff line
@@ -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;

    optional bool concurrent_multi_user_mode_enabled = 25;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -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;
@@ -4560,6 +4561,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);

        }

    }
@@ -6013,6 +6015,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:");