From cbb5053b6c3bc113b3ca5441d6938ee1a23260c3 Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Sat, 17 Mar 2012 01:12:29 +0900
Subject: [PATCH] Fix NPE

bug: 6181736

Change-Id: I6522f19555c27f33c9ff4eaa8b2559a51a38f015
---
 .../inputmethod/latin/UserBigramDictionary.java      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/java/src/com/android/inputmethod/latin/UserBigramDictionary.java b/java/src/com/android/inputmethod/latin/UserBigramDictionary.java
index 42d3a70cd..91f84bed1 100644
--- a/java/src/com/android/inputmethod/latin/UserBigramDictionary.java
+++ b/java/src/com/android/inputmethod/latin/UserBigramDictionary.java
@@ -115,8 +115,16 @@ public class UserBigramDictionary extends ExpandableDictionary {
 
         @Override
         public boolean equals(Object bigram) {
-            Bigram bigram2 = (Bigram) bigram;
-            return (mWord1.equals(bigram2.mWord1) && mWord2.equals(bigram2.mWord2));
+            if (!(bigram instanceof Bigram)) {
+                return false;
+            }
+            final Bigram bigram2 = (Bigram) bigram;
+            final boolean eq1 =
+                    mWord1 == null ? bigram2.mWord1 == null : mWord1.equals(bigram2.mWord1);
+            if (!eq1) {
+                return false;
+            }
+            return mWord2 == null ? bigram2.mWord2 == null : mWord2.equals(bigram2.mWord2);
         }
 
         @Override