Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dont persist config on failure" into gingerbread

Browse Source
This commit is contained in:
Irfan Sheriff
2010-06-11 15:28:24 -07:00
committed by Android (Google) Code Review
parent f62c57d684 afadc8b4e1
commit c2bc66d405
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/WifiService.java
View File

@@ -679,9 +679,9 @@ public class WifiService extends IWifiManager.Stub {
/* Configuration changed on a running access point */ /* Configuration changed on a running access point */
if(enable && (wifiConfig != null)) { if(enable && (wifiConfig != null)) {
try { try {
persistApConfiguration(wifiConfig);
nwService.setAccessPoint(wifiConfig, mWifiStateTracker.getInterfaceName(), nwService.setAccessPoint(wifiConfig, mWifiStateTracker.getInterfaceName(),
SOFTAP_IFACE); SOFTAP_IFACE);
persistApConfiguration(wifiConfig);
return true; return true;
} catch(Exception e) { } catch(Exception e) {
Slog.e(TAG, "Exception in nwService during AP restart"); 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.SSID = mContext.getString(R.string.wifi_tether_configure_ssid_default);
wifiConfig.allowedKeyManagement.set(KeyMgmt.NONE); wifiConfig.allowedKeyManagement.set(KeyMgmt.NONE);
} }
persistApConfiguration(wifiConfig);
if (!mWifiStateTracker.loadDriver()) { if (!mWifiStateTracker.loadDriver()) {
Slog.e(TAG, "Failed to load Wi-Fi driver for AP mode"); Slog.e(TAG, "Failed to load Wi-Fi driver for AP mode");
@@ -734,6 +733,8 @@ public class WifiService extends IWifiManager.Stub {
return false; return false;
} }
persistApConfiguration(wifiConfig);
} else { } else {
try { try {