From d8aec08fa96c42a61bd6ead2aa9859b5b67a3f2c Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Tue, 20 May 2014 10:49:50 -0700 Subject: [PATCH] Fix potential NPE with ActionBar and SwitchBar references - 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 --- src/com/android/settings/SettingsActivity.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index b19310457c..33c9950620 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -505,9 +505,10 @@ public class SettingsActivity extends Activity } mActionBar = getActionBar(); - mActionBar.setDisplayHomeAsUpEnabled(mDisplayHomeAsUpEnabled); - mActionBar.setHomeButtonEnabled(mDisplayHomeAsUpEnabled); - + if (mActionBar != null) { + mActionBar.setDisplayHomeAsUpEnabled(mDisplayHomeAsUpEnabled); + mActionBar.setHomeButtonEnabled(mDisplayHomeAsUpEnabled); + } mSwitchBar = (SwitchBar) findViewById(R.id.switch_bar); // see if we should show Back/Next buttons @@ -1250,7 +1251,8 @@ public class SettingsActivity extends Activity if (current != null && current instanceof SearchResultsSummary) { mSearchResultsFragment = (SearchResultsSummary) current; } else { - final boolean isShowingSwitchBar = mSwitchBar.isShowing(); + final boolean isShowingSwitchBar = + (mSwitchBar != null) ? mSwitchBar.isShowing() : false; String title = getString(R.string.search_results_title); mSearchResultsFragment = (SearchResultsSummary) switchToFragment( SearchResultsSummary.class.getName(), null, false, true, title, -- 2.11.0