Merge "Dont persist config on failure" into gingerbread (c2bc66d4) · Commits · e / os / android_frameworks_base

services/java/com/android/server/WifiService.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -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 {