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

1 files changed, 10 insertions, 0 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java
index 58496622f..82b0b96f8 100644
--- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProviderTest.java
@@ -57,6 +57,7 @@ import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.cert.X509Certificate;
 import java.util.Arrays;
+import java.util.BitSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -889,6 +890,8 @@ public class PasspointProviderTest {
         byte[] base64EncodedPw =
                 Base64.encode(password.getBytes(StandardCharsets.UTF_8), Base64.DEFAULT);
         String encodedPasswordStr = new String(base64EncodedPw, StandardCharsets.UTF_8);
+        BitSet allowedProtocols = new BitSet();
+        allowedProtocols.set(WifiConfiguration.Protocol.RSN);
 
         // Create provider.
         PasspointConfiguration config = new PasspointConfiguration();
@@ -923,6 +926,7 @@ public class PasspointProviderTest {
         assertTrue(Arrays.equals(rcOIs, wifiConfig.roamingConsortiumIds));
         assertTrue(wifiConfig.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.WPA_EAP));
         assertTrue(wifiConfig.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.IEEE8021X));
+        assertEquals(allowedProtocols, wifiConfig.allowedProtocols);
         assertFalse(wifiConfig.shared);
         assertEquals(realm, wifiEnterpriseConfig.getRealm());
         assertEquals(fqdn, wifiEnterpriseConfig.getDomainSuffixMatch());
@@ -947,6 +951,8 @@ public class PasspointProviderTest {
         String friendlyName = "Friendly Name";
         long[] rcOIs = new long[] {0x1234L, 0x2345L};
         String realm = "realm.com";
+        BitSet allowedProtocols = new BitSet();
+        allowedProtocols.set(WifiConfiguration.Protocol.RSN);
 
         // Create provider.
         PasspointConfiguration config = new PasspointConfiguration();
@@ -986,6 +992,7 @@ public class PasspointProviderTest {
         assertTrue(Arrays.equals(rcOIs, wifiConfig.roamingConsortiumIds));
         assertTrue(wifiConfig.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.WPA_EAP));
         assertTrue(wifiConfig.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.IEEE8021X));
+        assertEquals(allowedProtocols, wifiConfig.allowedProtocols);
         assertFalse(wifiConfig.shared);
         assertEquals(realm, wifiEnterpriseConfig.getRealm());
         assertEquals(fqdn, wifiEnterpriseConfig.getDomainSuffixMatch());
@@ -1009,6 +1016,8 @@ public class PasspointProviderTest {
         long[] rcOIs = new long[] {0x1234L, 0x2345L};
         String realm = "realm.com";
         String imsi = "1234*";
+        BitSet allowedProtocols = new BitSet();
+        allowedProtocols.set(WifiConfiguration.Protocol.RSN);
 
         // Create provider.
         PasspointConfiguration config = new PasspointConfiguration();
@@ -1036,6 +1045,7 @@ public class PasspointProviderTest {
         assertTrue(Arrays.equals(rcOIs, wifiConfig.roamingConsortiumIds));
         assertTrue(wifiConfig.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.WPA_EAP));
         assertTrue(wifiConfig.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.IEEE8021X));
+        assertEquals(allowedProtocols, wifiConfig.allowedProtocols);
         assertFalse(wifiConfig.shared);
         assertEquals(realm, wifiEnterpriseConfig.getRealm());
         assertEquals(fqdn, wifiEnterpriseConfig.getDomainSuffixMatch());