From 30cd0cd2a034f7323f71654df3aaad3abd8ca3a3 Mon Sep 17 00:00:00 2001
From: Keisuke Kuroyanagi <ksk@google.com>
Date: Fri, 28 Mar 2014 12:17:44 +0900
Subject: Fix: NPE after onDestroy().

Bug: 13671513
Change-Id: I06aa14870ff5422ad514356ee406600b247858c5
---
 .../android/inputmethod/latin/ExpandableBinaryDictionary.java    | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java')

diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
index 7847738e0..3c1015926 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -269,6 +269,9 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
     }
 
     private void runGCAfterAllPrioritizedTasksIfRequiredLocked(final boolean mindsBlockByGC) {
+        if (mBinaryDictionary == null) {
+            return;
+        }
         // needsToRunGC() have to be called with lock.
         if (mBinaryDictionary.needsToRunGC(mindsBlockByGC)) {
             if (setProcessingLargeTaskIfNot()) {
@@ -357,6 +360,9 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
             public void run() {
                 final boolean locked = setProcessingLargeTaskIfNot();
                 try {
+                    if (mBinaryDictionary == null) {
+                        return;
+                    }
                     mBinaryDictionary.addMultipleDictionaryEntries(
                             languageModelParams.toArray(
                                     new LanguageModelParam[languageModelParams.size()]));
@@ -496,6 +502,9 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
     }
 
     private void flushDictionaryLocked() {
+        if (mBinaryDictionary == null) {
+            return;
+        }
         if (mBinaryDictionary.needsToRunGC(false /* mindsBlockByGC */)) {
             mBinaryDictionary.flushWithGC();
         } else {
-- 
cgit v1.2.3-83-g751a