diff options
| author | Yohei Yukawa <yukawa@google.com> | 2014-05-19 07:45:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-19 07:45:12 +0000 |
| commit | b503d782f506aa07662a31de83b2f36bb89dc952 (patch) | |
| tree | 078bcee43bb8c575aa1dcedea4221d314a38ea29 | |
| parent | a611e45774f277eb45b868514a7fe476f6b448a2 (diff) | |
| parent | 9d91b43c8d0fa233905ecf132c6e6ee664904694 (diff) | |
| download | frameworks_base-b503d782f506aa07662a31de83b2f36bb89dc952.zip frameworks_base-b503d782f506aa07662a31de83b2f36bb89dc952.tar.gz frameworks_base-b503d782f506aa07662a31de83b2f36bb89dc952.tar.bz2 | |
Merge "Do not pass null to IInputMethod#setSessionEnabled"
| -rw-r--r-- | services/core/java/com/android/server/InputMethodManagerService.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 0b9570d..50553ee 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -2369,20 +2369,20 @@ public class InputMethodManagerService extends IInputMethodManager.Stub void setEnabledSessionInMainThread(SessionState session) { if (mEnabledSession != session) { - if (mEnabledSession != null) { + if (mEnabledSession != null && mEnabledSession.session != null) { try { if (DEBUG) Slog.v(TAG, "Disabling: " + mEnabledSession); - mEnabledSession.method.setSessionEnabled( - mEnabledSession.session, false); + mEnabledSession.method.setSessionEnabled(mEnabledSession.session, false); } catch (RemoteException e) { } } mEnabledSession = session; - try { - if (DEBUG) Slog.v(TAG, "Enabling: " + mEnabledSession); - session.method.setSessionEnabled( - session.session, true); - } catch (RemoteException e) { + if (mEnabledSession != null && mEnabledSession.session != null) { + try { + if (DEBUG) Slog.v(TAG, "Enabling: " + mEnabledSession); + mEnabledSession.method.setSessionEnabled(mEnabledSession.session, true); + } catch (RemoteException e) { + } } } } |