From 3d5aeb766bba496fb9e41d119eb4a31e7afa1f2e Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Fri, 9 May 2014 14:59:19 -0700
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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