From e336450bd3f9375fca3344ac3d5912689477ff85 Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Tue, 23 Jan 2018 09:43:01 -0800 Subject: 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 | 4 ++++ 1 file changed, 4 insertions(+) (limited to '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 c84b8fc72..95929383b 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 @@ final class SearchBarView extends FrameLayout { } private void onSearchBackButtonClicked() { + if (!isExpanded) { + return; + } + listener.onSearchBackButtonClicked(); collapse(true); } -- cgit v1.2.3