commit 00a227596d5a1d5b68943fda80f3680b72601005
author Michael Kolb <kolby@google.com> Thu Mar 03 17:13:30 2011 -0800
committer Michael Kolb <kolby@google.com> Thu Mar 03 17:13:35 2011 -0800
tree 20258e0998756a3d5de5368f51a6b4f883b4646f
parent d0a0e2b4f99f996b578f000214e96a346cb7b55d

fix NPE in instant suggestions

    Bug: 3510741
    check for null searchbox which might be returned
    by change I256375b2

Change-Id: Ic40209f2c1ea9a87098ce11586b4fd92f9065559

src/com/android/browser/InstantSearchEngine.java

diff --git a/src/com/android/browser/InstantSearchEngine.java b/src/com/android/browser/InstantSearchEngine.java
index 1d9bdd6..128997c 100644
--- a/src/com/android/browser/InstantSearchEngine.java
+++ b/src/com/android/browser/InstantSearchEngine.java
@@ -185,7 +185,9 @@
                 mListener.clear();
             }
             mSearchBox = searchBox;
-            mSearchBox.addSearchBoxListener(mListener);
+            if (mSearchBox != null) {
+                mSearchBox.addSearchBoxListener(mListener);
+            }
         }
     }