diff options
| author | Ken Wakasa <kwakasa@google.com> | 2011-01-24 21:37:53 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-24 21:37:53 -0800 |
| commit | bc891b67e07fd6f5077f88879299dbdf27ae9ee1 (patch) | |
| tree | 6675d5681da531070326d02d75518316e765e958 | |
| parent | 5d9d03a0234faa3cffd11502f973057045cafe82 (diff) | |
| parent | a308c0326bef49293396ceca843bb595139ba38f (diff) | |
| download | frameworks_base-bc891b67e07fd6f5077f88879299dbdf27ae9ee1.zip frameworks_base-bc891b67e07fd6f5077f88879299dbdf27ae9ee1.tar.gz frameworks_base-bc891b67e07fd6f5077f88879299dbdf27ae9ee1.tar.bz2 | |
Merge "Fix NPE in IInputMethodSessionWrapper.executeMessage" into honeycomb
| -rw-r--r-- | core/java/android/inputmethodservice/IInputMethodSessionWrapper.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java b/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java index 01fc010..df8cf9a 100644 --- a/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java +++ b/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java @@ -76,6 +76,8 @@ class IInputMethodSessionWrapper extends IInputMethodSession.Stub } public void executeMessage(Message msg) { + if (mInputMethodSession == null) return; + switch (msg.what) { case DO_FINISH_INPUT: mInputMethodSession.finishInput(); |