Skip to content

Commit 6be35dd

Browse files
satok16Android (Google) Code Review
authored andcommitted
Merge "Fix an issue on showInputMethodPickerFromClient" into jb-mr1-dev
2 parents 8f4baad + c86884c commit 6be35dd

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ private boolean calledFromValidUser() {
900900
Slog.d(TAG, "--- calledFromForegroundUserOrSystemProcess ? "
901901
+ "calling uid = " + uid + " system uid = " + Process.SYSTEM_UID
902902
+ " calling userId = " + userId + ", foreground user id = "
903-
+ mSettings.getCurrentUserId() + ", calling uid = " + Binder.getCallingPid());
903+
+ mSettings.getCurrentUserId() + ", calling pid = " + Binder.getCallingPid());
904904
}
905905
if (uid == Process.SYSTEM_UID || userId == mSettings.getCurrentUserId()) {
906906
return true;
@@ -2673,6 +2673,8 @@ public void onClick(DialogInterface dialog, int whichButton) {
26732673
mSwitchingDialog.setCanceledOnTouchOutside(true);
26742674
mSwitchingDialog.getWindow().setType(
26752675
WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG);
2676+
mSwitchingDialog.getWindow().getAttributes().privateFlags |=
2677+
WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;
26762678
mSwitchingDialog.getWindow().getAttributes().setTitle("Select input method");
26772679
mSwitchingDialog.show();
26782680
}

0 commit comments

Comments
 (0)