resolved conflicts for merge of f9360dbc to master

Change-Id: I2e468d83a7ce5200c59f63b4362e7bee10d0a2eb

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

@@ -136,8 +136,6 @@ public class WifiSettings extends RestrictedSettingsFragment
     private AccessPoint mDlgAccessPoint;
     private Bundle mAccessPointSavedState;
 
-    private SwitchBar mSwitchBar;
-
     /** verbose logging flag. this flag is set thru developer debugging options
      * and used so as to assist with in-the-field WiFi connectivity debugging  */
     public static int mVerboseLogging = 0;
@@ -232,6 +230,15 @@ public class WifiSettings extends RestrictedSettingsFragment
         setHasOptionsMenu(true);
     }
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        if (mWifiEnabler != null) {
+            mWifiEnabler.teardownSwitchBar();
+        }
+    }
+
     @Override
     public void onStart() {
         super.onStart();