commit 691e93397eae9a29d979a5e404f0b90130c2e9d4
author Dmitri Plotnikov <dplotnikov@google.com> Thu Dec 16 18:49:24 2010 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Thu Dec 16 18:49:24 2010 -0800
tree acf7eb3354cbaa23574858eb0f369c5a41843925
parent ca28437711c241fb3a3dbf238a1ac41ac241a517

Fixing NPE on search button hit in ContactsBrowserActivity

Change-Id: Icc2fb4d6d5faa2eceb10edfdb6fd4d17e7b483c2

src/com/android/contacts/activities/ContactBrowserActivity.java

diff --git a/src/com/android/contacts/activities/ContactBrowserActivity.java b/src/com/android/contacts/activities/ContactBrowserActivity.java
index 2c9fa87..c8d8a5f 100644
--- a/src/com/android/contacts/activities/ContactBrowserActivity.java
+++ b/src/com/android/contacts/activities/ContactBrowserActivity.java
@@ -846,10 +846,10 @@
     @Override
     public void startSearch(String initialQuery, boolean selectInitialQuery, Bundle appSearchData,
             boolean globalSearch) {
-        if (globalSearch) {
-            super.startSearch(initialQuery, selectInitialQuery, appSearchData, globalSearch);
-        } else {
+        if (mListFragment != null && mListFragment.isAdded() && !globalSearch) {
             mListFragment.startSearch(initialQuery);
+        } else {
+            super.startSearch(initialQuery, selectInitialQuery, appSearchData, globalSearch);
         }
     }