2 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/documentsui/queries/SearchFragment.java b/src/com/android/documentsui/queries/SearchFragment.java
index c2368035e..92cd91a3f 100644
--- a/src/com/android/documentsui/queries/SearchFragment.java
+++ b/src/com/android/documentsui/queries/SearchFragment.java
@@ -97,8 +97,8 @@ public class SearchFragment extends Fragment {
     }
 
     @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
 
         final BaseActivity activity = (BaseActivity) getActivity();
         final Injector injector = activity.getInjector();
diff --git a/src/com/android/documentsui/queries/SearchViewManager.java b/src/com/android/documentsui/queries/SearchViewManager.java
index a978ceaab..b1016952f 100644
--- a/src/com/android/documentsui/queries/SearchViewManager.java
+++ b/src/com/android/documentsui/queries/SearchViewManager.java
@@ -333,8 +333,6 @@ public class SearchViewManager implements
     public boolean cancelSearch() {
         if (mSearchView != null && (isExpanded() || isSearching())) {
             cancelQueuedSearch();
-            // If the query string is not empty search view won't get iconified
-            mSearchView.setQuery("", false);
 
             if (mFullBar) {
                 onClose();