diff options
author | Roshan Pius <rpius@google.com> | 2016-12-07 22:01:14 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-07 22:01:15 +0000 |
commit | d98d7625e0a47c2fdaa8c85819391eb622a5249a (patch) | |
tree | f4c282f8cec221f33606939aa8737c98b88739ad | |
parent | 139a17fd50072bcc04749c18e0f2ebf3385f29b8 (diff) | |
parent | ef31a2f1ce9d98e55641c8529aec14b9df0eed5b (diff) | |
download | wifi-d98d7625e0a47c2fdaa8c85819391eb622a5249a.tar.gz |
Merge "DO NOT MERGE: WifiConfigStore: Remove config validity check" into nyc-mr2-dev
-rw-r--r-- | service/java/com/android/server/wifi/WifiConfigStore.java | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java index cfed460cb..beb3373d2 100644 --- a/service/java/com/android/server/wifi/WifiConfigStore.java +++ b/service/java/com/android/server/wifi/WifiConfigStore.java @@ -421,13 +421,6 @@ public class WifiConfigStore { } config.setIpAssignment(IpAssignment.DHCP); config.setProxySettings(ProxySettings.NONE); - if (!WifiServiceImpl.isValid(config)) { - if (mShowNetworks) { - localLog("Ignoring network " + config.networkId + " because configuration " - + "loaded from wpa_supplicant.conf is not valid."); - } - continue; - } // The configKey is explicitly stored in wpa_supplicant.conf, because config does // not contain sufficient information to compute it at this point. String configKey = extras.get(ID_STRING_KEY_CONFIG_KEY); |