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

Commit 1bb002c7 authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android Git Automerger
Browse files

am 255cfabb: am 6be35dd6: Merge "Fix an issue on showInputMethodPickerFromClient" into jb-mr1-dev 

* commit '255cfabb':
  Fix an issue on showInputMethodPickerFromClient
parents 33c30e36 255cfabb

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

+3 −1
Original line number Diff line number Diff line
@@ -900,7 +900,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
            Slog.d(TAG, "--- calledFromForegroundUserOrSystemProcess ? "

                    + "calling uid = " + uid + " system uid = " + Process.SYSTEM_UID

                    + " calling userId = " + userId + ", foreground user id = "

                    + mSettings.getCurrentUserId() + ", calling uid = " + Binder.getCallingPid());

                    + mSettings.getCurrentUserId() + ", calling pid = " + Binder.getCallingPid());

        }

        if (uid == Process.SYSTEM_UID || userId == mSettings.getCurrentUserId()) {

            return true;
@@ -2673,6 +2673,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
            mSwitchingDialog.setCanceledOnTouchOutside(true);

            mSwitchingDialog.getWindow().setType(

                    WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG);

            mSwitchingDialog.getWindow().getAttributes().privateFlags |=

                    WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;

            mSwitchingDialog.getWindow().getAttributes().setTitle("Select input method");

            mSwitchingDialog.show();

        }