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

satok16 · Android Git Automerger · commit f23a2df32641 · 2012-10-05T18:01:14.000-07:00
* commit 'f948500239803b2b7247ff5058e39e4d645c5b70':
  Fix the issue on the input method switch picker
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
@@ -2531,15 +2531,15 @@ private void showInputMethodAndSubtypeEnabler(String inputMethodId) {
         if (!TextUtils.isEmpty(inputMethodId)) {
             intent.putExtra(Settings.EXTRA_INPUT_METHOD_ID, inputMethodId);
         }
-        mContext.startActivity(intent);
+        mContext.startActivityAsUser(intent, null, UserHandle.CURRENT);
     }
 
     private void showConfigureInputMethods() {
         Intent intent = new Intent(Settings.ACTION_INPUT_METHOD_SETTINGS);
         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() {

Original file line number	Diff line number	Diff line change
`@@ -2531,15 +2531,15 @@ private void showInputMethodAndSubtypeEnabler(String inputMethodId) {`
`2531`	`2531`	`if (!TextUtils.isEmpty(inputMethodId)) {`
`2532`	`2532`	`intent.putExtra(Settings.EXTRA_INPUT_METHOD_ID, inputMethodId);`
`2533`	`2533`	`}`
`2534`		`- mContext.startActivity(intent);`
	`2534`	`+ mContext.startActivityAsUser(intent, null, UserHandle.CURRENT);`
`2535`	`2535`	`}`
`2536`	`2536`
`2537`	`2537`	`private void showConfigureInputMethods() {`
`2538`	`2538`	`Intent intent = new Intent(Settings.ACTION_INPUT_METHOD_SETTINGS);`
`2539`	`2539`	`intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK`
`2540`	`2540`	`\| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED`
`2541`	`2541`	`\| Intent.FLAG_ACTIVITY_CLEAR_TOP);`
`2542`		`- mContext.startActivity(intent);`
	`2542`	`+ mContext.startActivityAsUser(intent, null, UserHandle.CURRENT);`
`2543`	`2543`	`}`
`2544`	`2544`
`2545`	`2545`	`private boolean isScreenLocked() {`