commit c25e50770fd10aa009ae6fe6cd9e2dfdae745bbf
author Arthur Wang <wuwang@google.com> Thu Jul 28 23:50:11 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 28 23:50:11 2016 +0000
tree cf8109f87beb49907d393172fc458bbbae0b701f
parent 794dbd0aa20eb6f291750adf7e88b0d6163659d6
parent 2c6fd614115a83babdca2db50d7623066b7117c1

Merge "Bump up AOSP Contacts to 1.5.9." into ub-contactsdialer-f-dev

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

diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index d1f05f6..ab25dc8 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -683,11 +683,11 @@
             return;
         }
 
-        if (mIsSearchMode) {
+        if (isSelectionMode()) {
+            mActionBarAdapter.setSelectionMode(false);
+        } else if (mIsSearchMode) {
             mIsSearchMode = false;
             configureSearchMode();
-        } else if (isSelectionMode()) {
-            mActionBarAdapter.setSelectionMode(false);
         } else {
             super.onBackPressed();
         }