commit a1ebae6f718ee5fddcb33b8464c78c581ae05d69
author Maurice Lam <yukl@google.com> Wed May 14 10:18:55 2014 -0700
committer Maurice Lam <yukl@google.com> Wed May 14 10:18:55 2014 -0700
tree 861fccc71846eb85a0cd7c65259a16db816257cc
parent 1975349c11af6dbf6e7e2ee8ba17fdc7af4a4608

[WifiSettings] Fix NullPointerException during setup

The wifi setup activity that setup wizard uses does not have an
action bar.

bug: 14930301
Change-Id: I14f276c1932cb725bffd765faafc0edf6f1d54f6

src/com/android/settings/wifi/WifiSettings.java

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 4e702b5..456198a 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -435,9 +435,11 @@
     @Override
     public void onStop() {
         super.onStop();
-        final Activity activity = getActivity();
-        activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);
-        activity.getActionBar().setCustomView(null);
+        if (!mSetupWizardMode) {
+            final Activity activity = getActivity();
+            activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);
+            activity.getActionBar().setCustomView(null);
+        }
     }
 
     @Override