Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev
diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java
index 1b3a731..f88a4df 100644
--- a/src/com/android/settings/wifi/WifiSettings2.java
+++ b/src/com/android/settings/wifi/WifiSettings2.java
@@ -423,8 +423,8 @@
                 final WifiConfiguration wifiConfiguration = data.getParcelableExtra(
                         ConfigureWifiEntryFragment.NETWORK_CONFIG_KEY);
                 if (wifiConfiguration != null) {
-                    mWifiManager.save(wifiConfiguration,
-                            new WifiSaveThenConnectActionListener(wifiConfiguration));
+                    mWifiManager.connect(wifiConfiguration,
+                            new WifiConnectActionListener());
                 }
             }
             return;
@@ -970,29 +970,6 @@
                 fullScreenEdit));
     }
 
-    private class WifiSaveThenConnectActionListener implements WifiManager.ActionListener {
-        final WifiConfiguration mWifiConfiguration;
-
-        WifiSaveThenConnectActionListener(WifiConfiguration wifiConfiguration) {
-            mWifiConfiguration = wifiConfiguration;
-        }
-
-        @Override
-        public void onSuccess() {
-            mWifiManager.connect(mWifiConfiguration, new WifiConnectActionListener());
-        }
-
-        @Override
-        public void onFailure(int reason) {
-            final Activity activity = getActivity();
-            if (isFisishingOrDestroyed(activity)) {
-                return;
-            }
-
-            Toast.makeText(activity, R.string.wifi_failed_save_message, Toast.LENGTH_SHORT).show();
-        }
-    };
-
     private class WifiConnectActionListener implements WifiManager.ActionListener {
         @Override
         public void onSuccess() {