diff options
| author | Atsushi Kawano <atsushi.x.kawano@sony.com> | 2018-10-25 11:38:46 +0900 |
|---|---|---|
| committer | Ecco Park <eccopark@google.com> | 2018-10-30 23:50:40 +0000 |
| commit | e77a84b320e776d0e783d87b492d5f80ac6f9648 (patch) | |
| tree | 2e4689c3b020004a5d88fbb0e55d7662d4f41467 /service | |
| parent | d461ed97902a08f6f2a7014cbeafb288b590539e (diff) | |
Set RSN protocol only in Passpoint wifi configurations
Both RSN and WPA protocols are set in wifi configurations used
for Passpoint connection. In this case wpa_supplicant don't
recognize that the connection is for Passpoint purposes. This
leads to the issue that HS 2.0 Indication element is not added
to Association Request frame.
This change is to set RSN only in wifi configurations if they
are used for Passpoint connection.
Bug: 118505139
Test: test with Passpoint R2 capable AP
Test: ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Signed-off-by: Daichi Ueura <daichi.ueura@sony.com>
Change-Id: Ic4a3bdf9a92cd884ac1f22d54531a3ec135e3eb6
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/hotspot2/PasspointProvider.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/hotspot2/PasspointProvider.java b/service/java/com/android/server/wifi/hotspot2/PasspointProvider.java index 6d09a29ca..b0ad2f1ab 100644 --- a/service/java/com/android/server/wifi/hotspot2/PasspointProvider.java +++ b/service/java/com/android/server/wifi/hotspot2/PasspointProvider.java @@ -309,6 +309,9 @@ public class PasspointProvider { wifiConfig.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_EAP); wifiConfig.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.IEEE8021X); + // Set RSN only to tell wpa_supplicant that this network is for Passpoint. + wifiConfig.allowedProtocols.set(WifiConfiguration.Protocol.RSN); + WifiEnterpriseConfig enterpriseConfig = new WifiEnterpriseConfig(); enterpriseConfig.setRealm(mConfig.getCredential().getRealm()); enterpriseConfig.setDomainSuffixMatch(mConfig.getHomeSp().getFqdn()); |