Fixing an NPE caused by contact list initialization logic.

Bug: 2436884
Change-Id: Id615384b8da08146b587fca920f6ad99981c8351

diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index 3546d3c..2fdc458 100644 (file)
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -691,6 +691,7 @@ public class ContactsListActivity extends ListActivity implements View.OnCreateC
         }
 
         setupListView();
+        setupSearchView();
 
         mQueryHandler = new QueryHandler(this);
         mJustCreated = true;
@@ -749,10 +750,6 @@ public class ContactsListActivity extends ListActivity implements View.OnCreateC
      * Configures search UI.
      */
     private void setupSearchView() {
-        if (mSearchView != null) {
-            return;
-        }
-
         mSearchView = findViewById(R.id.searchView);
         mSearchEditText = (SearchEditText)mSearchView.findViewById(R.id.search_src_text);
         mSearchEditText.addTextChangedListener(this);
@@ -1024,7 +1021,6 @@ public class ContactsListActivity extends ListActivity implements View.OnCreateC
      *            auto shown automatically.
      */
     private void startSearchMode(boolean showKeyboard) {
-        setupSearchView();
         View tabs = findTabWidget();
         if (tabs != null) {
             tabs.setVisibility(View.GONE);