diff options
| author | Girish Moturu <gmoturu@google.com> | 2019-07-29 11:32:00 -0700 |
|---|---|---|
| committer | Girish Moturu <gmoturu@google.com> | 2019-07-30 11:41:38 -0700 |
| commit | 6bc62b543ad26d57ac317b2603588f137beeed78 (patch) | |
| tree | e98a40b38308f9b04c9d7f559e4064b648c3fff8 | |
| parent | 7ca9afd8f5c55566347647e28106b122202f07ca (diff) | |
| download | sl4a-6bc62b543ad26d57ac317b2603588f137beeed78.tar.gz | |
[WifiManagerFacade] Update genWifiNetworkSuggestion() method
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 picked changes from git_master
Bug: 136251599
Test: Verified the changes on rvc-release build
Change-Id: I6c1ddff8fee7d94781e4d9495d23ffbbbfe2b1f1
Merged-In: I0838a1aee3a76170983e637b85c752fce68d1cdc
| -rwxr-xr-x | Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 bfe176df..0f350267 100755 --- a/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java +++ b/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java @@ -656,7 +656,7 @@ public class WifiManagerFacade extends RpcReceiver { 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 { |