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

2013-09-16 20:36:50 +00:00
parent 7354b834fc 8c461c6fc6
commit af672998af
1 changed files with 2 additions and 1 deletions
--- a/services/java/com/android/server/wifi/WifiService.java
+++ b/services/java/com/android/server/wifi/WifiService.java
@@ -588,7 +588,8 @@ public final class WifiService extends IWifiManager.Stub {
     */
    public void setWifiApEnabled(WifiConfiguration wifiConfig, boolean enabled) {
        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();
        } else {
            Slog.e(TAG, "Invalid WifiConfiguration");