commit 23ae00c1d87d64578cd62da1894ee25da531ca11
author Fabrice Di Meglio <fdimeglio@google.com> Mon Apr 21 12:43:20 2014 -0700
committer Fabrice Di Meglio <fdimeglio@google.com> Mon Apr 21 12:43:20 2014 -0700
tree ca8ed2e6bc71d5690fda8f4bc35da2286377e841
parent 829c8fb2bc728cb871bc398c66ff71b56aa7ebb9

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

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 5bd33be..9d6e740 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -395,6 +395,10 @@
         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 @@
         mSearchMenuItemExpanded = false;
         getFragmentManager().popBackStackImmediate(SettingsActivity.BACK_STACK_PREFS,
                 FragmentManager.POP_BACK_STACK_INCLUSIVE);
-        mSearchMenuItem.collapseActionView();
+        if (mSearchMenuItem != null) {
+            mSearchMenuItem.collapseActionView();
+        }
     }
 }