commit 509d5f5d724448d107be83525180b1d8680d9490
author Brian Attwell <brianattwell@google.com> Fri May 16 00:12:38 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 16 00:12:39 2014 +0000
tree 04e200ac7f5915b95e40b7c11ddb4f7937bd3dc7
parent 838671a4be907cf34b4a578cea3b911bbd700856
parent b8671d271e6a7c48aca785b867ef9a86c5012a85

Merge "No "merge" and "seperate" actions on insert"

src/com/android/contacts/list/DefaultContactBrowseListFragment.java

diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index b16b76e..8f495a9 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -141,7 +141,9 @@
 
     /** Show or hide the directory-search progress spinner. */
     private void showSearchProgress(boolean show) {
-        mSearchProgress.setVisibility(show ? View.VISIBLE : View.GONE);
+        if (mSearchProgress != null) {
+            mSearchProgress.setVisibility(show ? View.VISIBLE : View.GONE);
+        }
     }
 
     private void checkHeaderViewVisibility() {