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
This commit is contained in:
@@ -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);
|
||||
if (mSearchMenuItem != null) {
|
||||
mSearchMenuItem.collapseActionView();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user