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

Commit 78fdfc08 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Hook up userId in IMMS#showInputMethodPicker() 

With this CL, a valid userId starts being propagated into
showInputMethodPicker() implementation when the concurrent multi-user
IME is enabled. While InputMethodMenuControllerNew cannot be used from
multiple users at the same time, propagating the right user ID should
still make sense.

There must be no observable behavior change in the single user mode.

Bug: 349904272
Test: presubmit
Flag: android.view.inputmethod.concurrent_input_methods
Change-Id: I0963968ad2a94144178d72f3d28ee8d31ac4f46e
parent 24fdc0a1

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

+79 −85
Original line number Diff line number Diff line
@@ -254,8 +254,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
    private @interface MultiUserUnawareField {

    }



    private static final int MSG_SHOW_IM_SUBTYPE_PICKER = 1;



    private static final int MSG_HIDE_ALL_INPUT_METHODS = 1035;

    private static final int MSG_REMOVE_IME_SURFACE = 1060;

    private static final int MSG_REMOVE_IME_SURFACE_FROM_WINDOW = 1061;
@@ -3950,10 +3948,9 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
    }



    @GuardedBy("ImfLock.class")

    private boolean canShowInputMethodPickerLocked(IInputMethodClient client) {

    private boolean canShowInputMethodPickerLocked(IInputMethodClient client,

            @UserIdInt int userId) {

        final int uid = Binder.getCallingUid();

        // TODO(b/305849394): Get userId from callers.

        final int userId = mCurrentUserId;

        final var userData = getUserData(userId);

        if (userData.mImeBindingState.mFocusedWindowClient != null && client != null

                && userData.mImeBindingState.mFocusedWindowClient.mClient.asBinder()
@@ -3980,19 +3977,22 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
        }

        final int callingUserId = UserHandle.getCallingUserId();

        synchronized (ImfLock.class) {

            if (!canShowInputMethodPickerLocked(client)) {

            final int userId = resolveImeUserIdLocked(callingUserId);

            if (!canShowInputMethodPickerLocked(client, userId)) {

                Slog.w(TAG, "Ignoring showInputMethodPickerFromClient of uid "

                        + Binder.getCallingUid() + ": " + client);

                return;

            }

            final int userId = resolveImeUserIdLocked(callingUserId);

            final var userData = getUserData(userId);

            // Always call subtype picker, because subtype picker is a superset of input method

            // picker.

            final int displayId = (userData.mCurClient != null)

                    ? userData.mCurClient.mSelfReportedDisplayId : DEFAULT_DISPLAY;

            mHandler.obtainMessage(MSG_SHOW_IM_SUBTYPE_PICKER, auxiliarySubtypeMode, displayId)

                    .sendToTarget();

            mHandler.post(() -> {

                synchronized (ImfLock.class) {

                    showInputMethodPickerLocked(auxiliarySubtypeMode, displayId, userId);

                }

            });

        }

    }
@@ -4001,8 +4001,12 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
    public void showInputMethodPickerFromSystem(int auxiliarySubtypeMode, int displayId) {

        // Always call subtype picker, because subtype picker is a superset of input method

        // picker.

        mHandler.obtainMessage(MSG_SHOW_IM_SUBTYPE_PICKER, auxiliarySubtypeMode, displayId)

                .sendToTarget();

        mHandler.post(() -> {

            synchronized (ImfLock.class) {

                final int userId = resolveImeUserIdFromDisplayIdLocked(displayId);

                showInputMethodPickerLocked(auxiliarySubtypeMode, displayId, userId);

            }

        });

    }



    /**
@@ -4993,42 +4997,30 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
        userData.mEnabledAccessibilitySessions = accessibilitySessions;

    }



    @SuppressWarnings("unchecked")

    @UiThread

    @Override

    public boolean handleMessage(Message msg) {

        switch (msg.what) {

            case MSG_SHOW_IM_SUBTYPE_PICKER:

    @GuardedBy("ImfLock.class")

    private void showInputMethodPickerLocked(int auxiliarySubtypeMode, int displayId,

            @UserIdInt int userId) {

        final boolean showAuxSubtypes;

                final int displayId = msg.arg2;

                switch (msg.arg1) {

                    case InputMethodManager.SHOW_IM_PICKER_MODE_AUTO:

        switch (auxiliarySubtypeMode) {

            // This is undocumented so far, but IMM#showInputMethodPicker() has been

            // implemented so that auxiliary subtypes will be excluded when the soft

            // keyboard is invisible.

                        synchronized (ImfLock.class) {

            case InputMethodManager.SHOW_IM_PICKER_MODE_AUTO ->

                    showAuxSubtypes = mVisibilityStateComputer.isInputShown();

                        }

                        break;

                    case InputMethodManager.SHOW_IM_PICKER_MODE_INCLUDE_AUXILIARY_SUBTYPES:

            case InputMethodManager.SHOW_IM_PICKER_MODE_INCLUDE_AUXILIARY_SUBTYPES ->

                    showAuxSubtypes = true;

                        break;

                    case InputMethodManager.SHOW_IM_PICKER_MODE_EXCLUDE_AUXILIARY_SUBTYPES:

            case InputMethodManager.SHOW_IM_PICKER_MODE_EXCLUDE_AUXILIARY_SUBTYPES ->

                    showAuxSubtypes = false;

                        break;

                    default:

                        Slog.e(TAG, "Unknown subtype picker mode = " + msg.arg1);

                        return false;

            default -> {

                Slog.e(TAG, "Unknown subtype picker mode=" + auxiliarySubtypeMode);

                return;

            }

                synchronized (ImfLock.class) {

                    final InputMethodSettings settings =

                            InputMethodSettingsRepository.get(mCurrentUserId);

                    final int userId = settings.getUserId();

        }

        final InputMethodSettings settings = InputMethodSettingsRepository.get(userId);

        final boolean isScreenLocked = mWindowManagerInternal.isKeyguardLocked()

                && mWindowManagerInternal.isKeyguardSecure(userId);

        final String lastInputMethodId = settings.getSelectedInputMethod();

                    int lastInputMethodSubtypeId =

                            settings.getSelectedInputMethodSubtypeId(lastInputMethodId);

        int lastInputMethodSubtypeId = settings.getSelectedInputMethodSubtypeId(lastInputMethodId);



        final List<ImeSubtypeListItem> imList = InputMethodSubtypeSwitchingController

                .getSortedInputMethodAndSubtypeList(
@@ -5039,10 +5031,10 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
                    + " showAuxSubtypes: " + showAuxSubtypes

                    + " isScreenLocked: " + isScreenLocked

                    + " userId: " + userId);

                        return false;

            return;

        }



                    if (mNewInputMethodSwitcherMenuEnabled) {

        if (Flags.imeSwitcherRevamp()) {

            if (DEBUG) {

                Slog.v(TAG, "Show IME switcher menu,"

                        + " showAuxSubtypes=" + showAuxSubtypes
@@ -5068,10 +5060,12 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
                    lastInputMethodId, lastInputMethodSubtypeId, imList);

        }

    }

                return true;



            // ---------------------------------------------------------



    @SuppressWarnings("unchecked")

    @UiThread

    @Override

    public boolean handleMessage(Message msg) {

        switch (msg.what) {

            case MSG_HIDE_ALL_INPUT_METHODS: {

                @SoftInputShowHideReason final int reason = msg.arg1;

                final int originatingDisplayId = msg.arg2;