commit 3d5aeb766bba496fb9e41d119eb4a31e7afa1f2e
author Fabrice Di Meglio <fdimeglio@google.com> Fri May 09 14:59:19 2014 -0700
committer Fabrice Di Meglio <fdimeglio@google.com> Fri May 09 15:03:33 2014 -0700
tree ad29b278cf3f7182a6d6fc76a59781490acc302c
parent f420d2c0d310b6c4f760ebceb6e0dec7bbdb8076

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

- prevent NPE on mSearchResultsFragment

Change-Id: I063ff17e3936be7e608a37bd6a787946b4a310fe

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 56ee3ac..0a275fc 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1229,7 +1229,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);