PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug #14158603 Stability: NPE in Settings: Attempt to invoke...

Browse Source 
...interface method 'boolean android.view.MenuItem.collapseActionView()'
...on a null object reference

- fix cases where mSearchMenuItem or mSearchView could be null

Change-Id: I2b0256fe2c8c1b426d4e0799881dd2f13480a00a
This commit is contained in:
Fabrice Di Meglio
2014-04-21 12:43:20 -07:00
parent 829c8fb2bc
commit 23ae00c1d8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/SettingsActivity.java
View File

@@ -395,6 +395,10 @@ public class SettingsActivity extends Activity
mSearchMenuItem = menu.findItem(R.id.search); mSearchMenuItem = menu.findItem(R.id.search);
mSearchView = (SearchView) mSearchMenuItem.getActionView(); mSearchView = (SearchView) mSearchMenuItem.getActionView();
if (mSearchMenuItem == null || mSearchView == null) {
return false;
}
mSearchMenuItem.setOnActionExpandListener(this); mSearchMenuItem.setOnActionExpandListener(this);
mSearchView.setOnQueryTextListener(this); mSearchView.setOnQueryTextListener(this);
mSearchView.setOnCloseListener(this); mSearchView.setOnCloseListener(this);
@@ -1285,6 +1289,8 @@ public class SettingsActivity extends Activity
mSearchMenuItemExpanded = false; mSearchMenuItemExpanded = false;
getFragmentManager().popBackStackImmediate(SettingsActivity.BACK_STACK_PREFS, getFragmentManager().popBackStackImmediate(SettingsActivity.BACK_STACK_PREFS,
FragmentManager.POP_BACK_STACK_INCLUSIVE); FragmentManager.POP_BACK_STACK_INCLUSIVE);
mSearchMenuItem.collapseActionView(); if (mSearchMenuItem != null) {
mSearchMenuItem.collapseActionView();
}
} }
} }