diff options
author | Hai Shalom <haishalom@google.com> | 2019-05-14 16:45:05 -0700 |
---|---|---|
committer | Hai Shalom <haishalom@google.com> | 2019-05-14 16:48:58 -0700 |
commit | 9d8bc7f0dfb352e3369c26c1e6e5a697b75dfa31 (patch) | |
tree | a70d5f00c7a717ce99f908f822d0c1cc8c37ddf0 /service | |
parent | b788af3376c4b676795f04c0092d139780c664a9 (diff) |
[PSK/EAP] Do not add SHA256 Key mgmt for SupplicantHal < 1.2
Following on GSI Q on P failure:
Do not add SHA256 Key management where Supplicant HAL version
is lower than 1.2, where it is not supported.
Bug: 132656148
Test: atest SupplicantStaNetworkHalTest
Change-Id: Idf6f85fa409082b3b88dd36b624f8878be695709
Diffstat (limited to 'service')
-rw-r--r-- | service/java/com/android/server/wifi/SupplicantStaNetworkHal.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/SupplicantStaNetworkHal.java b/service/java/com/android/server/wifi/SupplicantStaNetworkHal.java index 059ea797c..9255fc231 100644 --- a/service/java/com/android/server/wifi/SupplicantStaNetworkHal.java +++ b/service/java/com/android/server/wifi/SupplicantStaNetworkHal.java @@ -3012,6 +3012,14 @@ public class SupplicantStaNetworkHal { private BitSet addSha256KeyMgmtFlags(BitSet keyManagementFlags) { synchronized (mLock) { BitSet modifiedFlags = (BitSet) keyManagementFlags.clone(); + android.hardware.wifi.supplicant.V1_2.ISupplicantStaNetwork + iSupplicantStaNetworkV12; + iSupplicantStaNetworkV12 = getV1_2StaNetwork(); + if (iSupplicantStaNetworkV12 == null) { + // SHA256 key management requires HALv1.2 or higher + return modifiedFlags; + } + if (keyManagementFlags.get(WifiConfiguration.KeyMgmt.WPA_PSK)) { modifiedFlags.set(WifiConfiguration.KeyMgmt.WPA_PSK_SHA256); } |