Merge "Fix the issue on the input method switch picker" into jb-mr1-dev

This commit is contained in:
Satoshi Kataoka
2012-10-05 17:59:07 -07:00
committed by Android (Google) Code Review

View File

@@ -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() {