diff options
| author | satok <satok@google.com> | 2012-12-05 12:28:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-05 12:28:17 -0800 |
| commit | fb21aa84a804c8d7dd0aad7df1e4a336ed59f991 (patch) | |
| tree | 35ea48a0839d11206817939a39ed7aba86c31922 /services/java/com/android/server | |
| parent | 1c328df48217616bf2975c7d38e8884b23cd306c (diff) | |
| parent | 8ec9f8f074ea35cad6e6a75a87e4bde947f12ea1 (diff) | |
| download | frameworks_base-fb21aa84a804c8d7dd0aad7df1e4a336ed59f991.zip frameworks_base-fb21aa84a804c8d7dd0aad7df1e4a336ed59f991.tar.gz frameworks_base-fb21aa84a804c8d7dd0aad7df1e4a336ed59f991.tar.bz2 | |
am 8ec9f8f0: am dc5b21a5: am 487f8e93: Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev
* commit '8ec9f8f074ea35cad6e6a75a87e4bde947f12ea1':
Fix an issue on installing 3rd-party IME by a non-primary user
Diffstat (limited to 'services/java/com/android/server')
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 3b60526..88f5533 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -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( |