From 23ae00c1d87d64578cd62da1894ee25da531ca11 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Mon, 21 Apr 2014 12:43:20 -0700
Subject: [PATCH] Fix bug #14158603 Stability: NPE in Settings: Attempt to
 invoke... ...interface method 'boolean
 android.view.MenuItem.collapseActionView()' ...on a null object reference

- fix cases where mSearchMenuItem or mSearchView could be null

Change-Id: I2b0256fe2c8c1b426d4e0799881dd2f13480a00a
---
 src/com/android/settings/SettingsActivity.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 5bd33be3bf5..9d6e740beb1 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -395,6 +395,10 @@ public class SettingsActivity extends Activity
         mSearchMenuItem = menu.findItem(R.id.search);
         mSearchView = (SearchView) mSearchMenuItem.getActionView();
 
+        if (mSearchMenuItem == null || mSearchView == null) {
+            return false;
+        }
+
         mSearchMenuItem.setOnActionExpandListener(this);
         mSearchView.setOnQueryTextListener(this);
         mSearchView.setOnCloseListener(this);
@@ -1285,6 +1289,8 @@ public class SettingsActivity extends Activity
         mSearchMenuItemExpanded = false;
         getFragmentManager().popBackStackImmediate(SettingsActivity.BACK_STACK_PREFS,
                 FragmentManager.POP_BACK_STACK_INCLUSIVE);
-        mSearchMenuItem.collapseActionView();
+        if (mSearchMenuItem != null) {
+            mSearchMenuItem.collapseActionView();
+        }
     }
 }