am dc5b21a5: am 487f8e93: Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev

* commit 'dc5b21a54850735bdfd1fbbd83375b2578ed4b02':
  Fix an issue on installing 3rd-party IME by a non-primary user
This commit is contained in:
satok
2012-12-04 17:14:17 -08:00
committed by Android Git Automerger

View File

@@ -444,7 +444,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
final int userId = getChangingUserId();
final boolean retval = userId == mSettings.getCurrentUserId();
if (DEBUG) {
Slog.d(TAG, "--- ignore this call back from a background user: " + userId);
if (!retval) {
Slog.d(TAG, "--- ignore this call back from a background user: " + userId);
}
}
return retval;
}
@@ -658,7 +660,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
} catch (RemoteException e) {
Slog.w(TAG, "Couldn't get current user ID; guessing it's 0", e);
}
mMyPackageMonitor.register(mContext, null, true);
mMyPackageMonitor.register(mContext, null, UserHandle.ALL, true);
// mSettings should be created before buildInputMethodListLocked
mSettings = new InputMethodSettings(