diff options
| author | Satoshi Kataoka <satok@google.com> | 2012-10-05 17:59:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-05 17:59:09 -0700 |
| commit | f948500239803b2b7247ff5058e39e4d645c5b70 (patch) | |
| tree | a545c2ec04710682b5f260ceba992b38f9684648 /services | |
| parent | 020daada9d5311921fe3185c68f083cf4aac18f8 (diff) | |
| parent | 3ba439d6481b7f23ade44bfde0700aaa1e076a32 (diff) | |
| download | frameworks_base-f948500239803b2b7247ff5058e39e4d645c5b70.zip frameworks_base-f948500239803b2b7247ff5058e39e4d645c5b70.tar.gz frameworks_base-f948500239803b2b7247ff5058e39e4d645c5b70.tar.bz2 | |
Merge "Fix the issue on the input method switch picker" into jb-mr1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 22fd508..e4998e11 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -2531,7 +2531,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub if (!TextUtils.isEmpty(inputMethodId)) { intent.putExtra(Settings.EXTRA_INPUT_METHOD_ID, inputMethodId); } - mContext.startActivity(intent); + mContext.startActivityAsUser(intent, null, UserHandle.CURRENT); } private void showConfigureInputMethods() { @@ -2539,7 +2539,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED | Intent.FLAG_ACTIVITY_CLEAR_TOP); - mContext.startActivity(intent); + mContext.startActivityAsUser(intent, null, UserHandle.CURRENT); } private boolean isScreenLocked() { |