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

Fix potential NPE with ActionBar and SwitchBar references

Browse Source 
- in some rare cases (SetupWizard and select WiFi during account
creation) there is no ActionBar nor SwitchBar. Prevent any NPE
coming from them.

Change-Id: If52b9cdee8730c90c5da3067a1a35ebdd0255470
This commit is contained in:
Fabrice Di Meglio
2014-05-20 10:49:50 -07:00
parent 8b81bfff2e
commit d8aec08fa9
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -505,9 +505,10 @@ public class SettingsActivity extends Activity
} }
mActionBar = getActionBar(); mActionBar = getActionBar();
mActionBar.setDisplayHomeAsUpEnabled(mDisplayHomeAsUpEnabled); if (mActionBar != null) {
mActionBar.setHomeButtonEnabled(mDisplayHomeAsUpEnabled); mActionBar.setDisplayHomeAsUpEnabled(mDisplayHomeAsUpEnabled);
mActionBar.setHomeButtonEnabled(mDisplayHomeAsUpEnabled);
}
mSwitchBar = (SwitchBar) findViewById(R.id.switch_bar); mSwitchBar = (SwitchBar) findViewById(R.id.switch_bar);
// see if we should show Back/Next buttons // see if we should show Back/Next buttons
@@ -1250,7 +1251,8 @@ public class SettingsActivity extends Activity
if (current != null && current instanceof SearchResultsSummary) { if (current != null && current instanceof SearchResultsSummary) {
mSearchResultsFragment = (SearchResultsSummary) current; mSearchResultsFragment = (SearchResultsSummary) current;
} else { } else {
final boolean isShowingSwitchBar = mSwitchBar.isShowing(); final boolean isShowingSwitchBar =
(mSwitchBar != null) ? mSwitchBar.isShowing() : false;
String title = getString(R.string.search_results_title); String title = getString(R.string.search_results_title);
mSearchResultsFragment = (SearchResultsSummary) switchToFragment( mSearchResultsFragment = (SearchResultsSummary) switchToFragment(
SearchResultsSummary.class.getName(), null, false, true, title, SearchResultsSummary.class.getName(), null, false, true, title,