| commit | 17d8465038cccba95e138bf541feeb98ff922932 | [log] [tgz] |
|---|---|---|
| author | Girish Moturu <gmoturu@google.com> | Sat Aug 03 11:48:17 2019 -0700 |
| committer | Girish Moturu <gmoturu@google.com> | Mon Aug 05 22:23:19 2019 +0000 |
| tree | 542fbd655737c2ae400e93b5967c0b5c1b648aae | |
| parent | 6bc62b543ad26d57ac317b2603588f137beeed78 [diff] |
[WifiManagerFacade] Fixes for WifiNetworkSuggestion Ent tests Enterprise configs has a WifiEnterpriseConfig.PASSWORD_KEY field which is same as PSK "password" field. genWifiNetworkSuggestion() builds Wpa2Passphrase and Wpa2EnterpriseConfig at the same time and as a result validateSecurityParams() throws an error Cherry pick changes from git_master Exempt-From-Owner-Approval: cherry picked changes from git_master Bug: 136251599 Test: Verified the changes Change-Id: I3f47ddc9d782926259f6e35799e7f3031a66d237 Merged-In: Iaf8ce08ab46b6adca9b9f15731c506acd835420f
diff --git a/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java index 0f35026..0183c69 100755 --- a/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java +++ b/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java
@@ -695,7 +695,7 @@ if (j.has("isWpa3") && j.getBoolean("isWpa3")) { isWpa3 = true; } - if (j.has("password")) { + if (j.has("password") && !j.has(WifiEnterpriseConfig.EAP_KEY)) { if (!isWpa3) { builder = builder.setWpa2Passphrase(j.getString("password")); } else {