Merge "Fix bug #14323469 Settings crash on selecting keyword from recent searches ... after changing orientation"

2014-05-13 02:39:12 +00:00
parent 46907dd2c4 8c3b0ce712
commit eab58139f4
2 changed files with 42 additions and 3 deletions
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -410,6 +410,10 @@ public class SettingsActivity extends Activity
            return false;
        }

+        if (mSearchResultsFragment != null) {
+            mSearchResultsFragment.setSearchView(mSearchView);
+        }
+
        mSearchMenuItem.setOnActionExpandListener(this);
        mSearchView.setOnQueryTextListener(this);
        mSearchView.setOnCloseListener(this);