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

Commit c8017fe4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Dump mPreventImeStartupUnlessTextEditor value" into main

parents 774cfca4 a9cbe75c

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

+1 −0
Original line number Diff line number Diff line
@@ -48,4 +48,5 @@ message InputMethodManagerServiceProto { 
    optional bool show_ime_with_hard_keyboard = 23;

    optional bool accessibility_requesting_no_soft_keyboard = 24;

    optional bool concurrent_multi_user_mode_enabled = 25;

    optional bool prevent_ime_startup_unless_text_editor = 26;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import static android.server.inputmethod.InputMethodManagerServiceProto.IME_WIND 
import static android.server.inputmethod.InputMethodManagerServiceProto.IN_FULLSCREEN_MODE;

import static android.server.inputmethod.InputMethodManagerServiceProto.IS_INTERACTIVE;

import static android.server.inputmethod.InputMethodManagerServiceProto.LAST_IME_TARGET_WINDOW_NAME;

import static android.server.inputmethod.InputMethodManagerServiceProto.PREVENT_IME_STARTUP_UNLESS_TEXT_EDITOR;

import static android.server.inputmethod.InputMethodManagerServiceProto.SHOW_IME_WITH_HARD_KEYBOARD;

import static android.server.inputmethod.InputMethodManagerServiceProto.SYSTEM_READY;

import static android.view.Display.DEFAULT_DISPLAY;
@@ -4730,6 +4731,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
                        mMenuController.getShowImeWithHardKeyboard());

            }

            proto.write(CONCURRENT_MULTI_USER_MODE_ENABLED, mConcurrentMultiUserModeEnabled);

            proto.write(PREVENT_IME_STARTUP_UNLESS_TEXT_EDITOR, mPreventImeStartupUnlessTextEditor);

            proto.end(token);

        }

    }
@@ -6108,6 +6110,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
        p.println("  mSystemReady=" + mSystemReady);

        p.println("  mInteractive=" + mIsInteractive);

        p.println("  mConcurrentMultiUserModeEnabled=" + mConcurrentMultiUserModeEnabled);

        p.println("  mPreventImeStartupUnlessTextEditor=" + mPreventImeStartupUnlessTextEditor);

        final int currentImeUserId;

        synchronized (ImfLock.class) {

            currentImeUserId = mCurrentImeUserId;