commit e336450bd3f9375fca3344ac3d5912689477ff85
author calderwoodra <calderwoodra@google.com> Tue Jan 23 09:43:01 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Tue Jan 23 11:24:06 2018 -0800
tree 9e2cf19c4910fb2efaea52e8c67213958b247d2b
parent 5feae4d9f7b3685be38b48c1806ceb03c6b2273c

Pressing back button twice really quickly no longer crashes dialer.

Bug: 72319656
Test: manual
PiperOrigin-RevId: 182947143
Change-Id: I70ed303ba8cdb64591ab6debf60eef540aacea73

java/com/android/dialer/main/impl/toolbar/SearchBarView.java

diff --git a/java/com/android/dialer/main/impl/toolbar/SearchBarView.java b/java/com/android/dialer/main/impl/toolbar/SearchBarView.java
index c84b8fc..9592938 100644
--- a/java/com/android/dialer/main/impl/toolbar/SearchBarView.java
+++ b/java/com/android/dialer/main/impl/toolbar/SearchBarView.java
@@ -82,6 +82,10 @@
   }
 
   private void onSearchBackButtonClicked() {
+    if (!isExpanded) {
+      return;
+    }
+
     listener.onSearchBackButtonClicked();
     collapse(true);
   }