diff options
| author | 2012-10-09 00:28:16 -0700 | |
|---|---|---|
| committer | 2012-10-09 00:28:17 -0700 | |
| commit | 6be35dd636bd530a781e997ea9f9a43fc82a1fef (patch) | |
| tree | 0c3141723393d5e0877061bbd74ac51a5c631aa0 | |
| parent | 8f4baad387d8ad63efbc05cfa8c4e4c472793deb (diff) | |
| parent | c86884cd839123e3be3cc97c8f293ac47d3624a9 (diff) | |
Merge "Fix an issue on showInputMethodPickerFromClient" into jb-mr1-dev
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index e4998e113682..ffbfef684811 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -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(); } |