commit a7e8b27a8597acf493cd0566cca4f2e7a0da23a2
author Fabrice Di Meglio <fdimeglio@google.com> Fri May 09 22:04:29 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 09 22:04:30 2014 +0000
tree 577ba0891c8ebc9b39640c24fff6ca048c69334c
parent 56c17b4d849c29578368140b9247f5c2faa87be2
parent 3d5aeb766bba496fb9e41d119eb4a31e7afa1f2e

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

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 0608e92..529bd5b 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1230,7 +1230,7 @@
     @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);