diff options
| author | Yuhao Zheng <yuhaozheng@google.com> | 2013-09-16 20:36:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-16 20:36:50 +0000 |
| commit | af672998af7fb0bba90f7d56504584a63ff189fa (patch) | |
| tree | 6670cbd52b9e239ef5c590ee64ad94a42475defd | |
| parent | 7354b834fc53a9d1885553aea58f632df16a5655 (diff) | |
| parent | 8c461c6fc6e060cb868e1492cc833c19fdeea0c2 (diff) | |
| download | frameworks_base-af672998af7fb0bba90f7d56504584a63ff189fa.zip frameworks_base-af672998af7fb0bba90f7d56504584a63ff189fa.tar.gz frameworks_base-af672998af7fb0bba90f7d56504584a63ff189fa.tar.bz2 | |
Merge "Fix Settings app crash while enabling tethering" into klp-dev
| -rw-r--r-- | services/java/com/android/server/wifi/WifiService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/wifi/WifiService.java b/services/java/com/android/server/wifi/WifiService.java index 025cd89..bbcd01a 100644 --- 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"); |