From 88327fb73b517e7723ab419cfc4f65ff65126c98 Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Fri, 4 Jun 2010 00:51:17 +0900
Subject: [PATCH] Fix NPE onDestroy

Change-Id: I6aa1951fd3d69e07d1fbc7712fe2526dd9a5ef57
---
 java/src/com/android/inputmethod/latin/LatinIME.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 6d620968a..e4f096628 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -355,10 +355,14 @@ public class LatinIME extends InputMethodService
 
     @Override
     public void onDestroy() {
-        mUserDictionary.close();
-        mContactsDictionary.close();
+        if (mUserDictionary != null) {
+            mUserDictionary.close();
+        }
+        if (mContactsDictionary != null) {
+            mContactsDictionary.close();
+        }
         unregisterReceiver(mReceiver);
-        if (VOICE_INSTALLED) {
+        if (VOICE_INSTALLED && mVoiceInput != null) {
             mVoiceInput.destroy();
         }
         LatinImeLogger.commit();