Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ec9f8f0 authored by satok's avatar satok Committed by Android Git Automerger
Browse files

am dc5b21a5: am 487f8e93: Merge "Fix an issue on installing 3rd-party IME by a... 

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

* commit 'dc5b21a5':
  Fix an issue on installing 3rd-party IME by a non-primary user
parents c0512832 dc5b21a5

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

+4 −2
Original line number Diff line number Diff line
@@ -444,8 +444,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
            final int userId = getChangingUserId();

            final boolean retval = userId == mSettings.getCurrentUserId();

            if (DEBUG) {

                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(