commit f4daee2785bb5d18eb67aa94bb89446f8f50ffbf
author Katherine Kuan <katherinekuan@google.com> Fri Jun 10 12:32:05 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 10 12:32:05 2011 -0700
tree 12b1b5ca9248a818eac1f88803a8f29eb4b7304c
parent 968ca24951d0db61575860d18855ec72cb5bf1ed
parent f3f933a798c9cfffb1c1c0cc770187b5b0b763eb

Merge "Fix NPE in ActionBarAdapter"

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

diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index 680c8bd..0541edb 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -108,6 +108,9 @@
         if (mSearchMode != flag) {
             mSearchMode = flag;
             update();
+            if (mSearchView == null) {
+                return;
+            }
             if (mSearchMode) {
                 mSearchView.requestFocus();
             } else {
@@ -122,7 +125,9 @@
 
     public void setQueryString(String query) {
         mQueryString = query;
-        mSearchView.setQuery(query, false);
+        if (mSearchView != null) {
+            mSearchView.setQuery(query, false);
+        }
     }
 
     public void update() {