commit 88327fb73b517e7723ab419cfc4f65ff65126c98
author satok <satok@google.com> Fri Jun 04 00:51:17 2010 +0900
committer satok <satok@google.com> Fri Jun 04 00:51:17 2010 +0900
tree f560d68e3bd93b51d58bf74de8081cc211ce65e4
parent dac53d9c7db2f948e3d51686e383e65b076ce51d

Fix NPE onDestroy

Change-Id: I6aa1951fd3d69e07d1fbc7712fe2526dd9a5ef57

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 6d62096..e4f0966 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -355,10 +355,14 @@
 
     @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();