commit e026fac8868f7393ccab2ce4ceb8faa9bd2530b2
author Andrew Lee <anwlee@google.com> Sat May 17 22:00:11 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 17 22:00:12 2014 +0000
tree 6413043c579801372c098dd37eede02ca55031d4
parent 6020ea4ec166f2a168c8ecf73a9a605169838da1
parent d4cde838ea2bc23679e8656d04ed096e82d938d4

Merge "Add magnifying glass to search box."

src/com/android/dialer/list/ListsFragment.java

diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java
index b4497e4..f2be6ab 100644
--- a/src/com/android/dialer/list/ListsFragment.java
+++ b/src/com/android/dialer/list/ListsFragment.java
@@ -347,7 +347,7 @@
         // TODO: Try to show the action bar regardless of whether the panel is open, and then update
         // the offset to show/hide the action bar, instead of updating the whether the action bar is
         // shown in onPanelSlide.
-        if (mIsPanelOpen) {
+        if (mIsPanelOpen && mActionBar != null) {
             mActionBar.show();
         }
     }