Merge "Fix bug #14302110 Settings crash on hitting back key from Wifi recent searches page"

This commit is contained in:
Fabrice Di Meglio
2014-05-09 22:04:29 +00:00
committed by Android (Google) Code Review

View File

@@ -1230,7 +1230,7 @@ public class SettingsActivity extends Activity
@Override
public boolean onQueryTextChange(String newText) {
mSearchQuery = newText;
if (TextUtils.isEmpty(newText) && mSearchResultsFragment == null) {
if (TextUtils.isEmpty(newText) || mSearchResultsFragment == null) {
return false;
}
return mSearchResultsFragment.onQueryTextChange(newText);