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

Merge "Fix bug #14158603 Stability: NPE in Settings: Attempt to invoke... ...interface method 'boolean android.view.MenuItem.collapseActionView()' ...on a null object reference"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-04-21 19:46:39 +00:00
committed by Android (Google) Code Review
parent 3e000df132 23ae00c1d8
commit 42aacb1f50
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

@@ -399,6 +399,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);
@@ -1289,6 +1293,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();
}
} }
} }