commit d8aec08fa96c42a61bd6ead2aa9859b5b67a3f2c
author Fabrice Di Meglio <fdimeglio@google.com> Tue May 20 10:49:50 2014 -0700
committer Fabrice Di Meglio <fdimeglio@google.com> Tue May 20 10:53:04 2014 -0700
tree 12cf2c4943a08a00c8a5ccfbed5a24e8bc83345b
parent 8b81bfff2ecc923774673ed37431951cd9fcaa67

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

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index b193104..33c9950 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -505,9 +505,10 @@
         }
 
         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 @@
         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,