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

am af672998: Merge "Fix Settings app crash while enabling tethering" into klp-dev

Browse Source 
* commit 'af672998af7fb0bba90f7d56504584a63ff189fa':
  Fix Settings app crash while enabling tethering
This commit is contained in:
Yuhao Zheng
2013-09-16 13:39:35 -07:00
committed by Android Git Automerger
parent 664b5df781 af672998af
commit 69ea666520
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/wifi/WifiService.java
View File

@@ -588,7 +588,8 @@ public final class WifiService extends IWifiManager.Stub {
*/ */
public void setWifiApEnabled(WifiConfiguration wifiConfig, boolean enabled) { public void setWifiApEnabled(WifiConfiguration wifiConfig, boolean enabled) {
enforceChangePermission(); enforceChangePermission();
if (wifiConfig.isValid()) { // null wifiConfig is a meaningful input for CMD_SET_AP
if (wifiConfig == null || wifiConfig.isValid()) {
mWifiController.obtainMessage(CMD_SET_AP, enabled ? 1 : 0, 0, wifiConfig).sendToTarget(); mWifiController.obtainMessage(CMD_SET_AP, enabled ? 1 : 0, 0, wifiConfig).sendToTarget();
} else { } else {
Slog.e(TAG, "Invalid WifiConfiguration"); Slog.e(TAG, "Invalid WifiConfiguration");