am c2bc66d4: Merge "Dont persist config on failure" into gingerbread

Merge commit 'c2bc66d40510be99e748697cb12c2609cc0e23fc' into gingerbread-plus-aosp

* commit 'c2bc66d40510be99e748697cb12c2609cc0e23fc':
  Dont persist config on failure

1 files changed, 3 insertions, 2 deletions

diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index 8d6ad9304a95..46a68ac3f03b 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -679,9 +679,9 @@ public class WifiService extends IWifiManager.Stub {
             /* Configuration changed on a running access point */
             if(enable && (wifiConfig != null)) {
                 try {
-                    persistApConfiguration(wifiConfig);
                     nwService.setAccessPoint(wifiConfig, mWifiStateTracker.getInterfaceName(),
                                              SOFTAP_IFACE);
+                    persistApConfiguration(wifiConfig);
                     return true;
                 } catch(Exception e) {
                     Slog.e(TAG, "Exception in nwService during AP restart");
@@ -717,7 +717,6 @@ public class WifiService extends IWifiManager.Stub {
                 wifiConfig.SSID = mContext.getString(R.string.wifi_tether_configure_ssid_default);
                 wifiConfig.allowedKeyManagement.set(KeyMgmt.NONE);
             }
-            persistApConfiguration(wifiConfig);
 
             if (!mWifiStateTracker.loadDriver()) {
                 Slog.e(TAG, "Failed to load Wi-Fi driver for AP mode");
@@ -734,6 +733,8 @@ public class WifiService extends IWifiManager.Stub {
                 return false;
             }
 
+            persistApConfiguration(wifiConfig);
+
         } else {
 
             try {