From a308c0326bef49293396ceca843bb595139ba38f Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Tue, 25 Jan 2011 14:02:07 +0900
Subject: Fix NPE in IInputMethodSessionWrapper.executeMessage

bug: 3384715
Change-Id: I4bd8f2b505318a9b3e17dccf6a583dc7f36a8a24
---
 core/java/android/inputmethodservice/IInputMethodSessionWrapper.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'core/java/android/inputmethodservice/IInputMethodSessionWrapper.java')

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();
-- 
cgit v1.1