Passpoint-r2: set provider name for OSU AP in WifiInfo

When the connection is for OSU AP, it needs to set osu and Provider
name in WifiInfo so that WifiPicker and Settings can make use of this
information.

Bug: 124462043
Test: ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: Tested with OSU AP and confirmed that the info is set
correctly.
Signed-off-by: Ecco Park <eccopark@google.com>

Change-Id: Ibc5d59dbc0f6b5d3335b997870e789ec82e0fbfa

2 files changed, 14 insertions, 12 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/OsuNetworkConnectionTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/OsuNetworkConnectionTest.java
index 65ab8588a..acfb4b47e 100644
--- a/tests/wifitests/src/com/android/server/wifi/hotspot2/OsuNetworkConnectionTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/OsuNetworkConnectionTest.java
@@ -69,6 +69,7 @@ public class OsuNetworkConnectionTest {
     private static final int TEST_NETWORK_ID = 6;
     private static final String TEST_NAI = null;
     private static final String TEST_NAI_OSEN = "access.test.com";
+    private static final String TEST_PROVIDER_NAME = "testService";
     private static final WifiSsid TEST_SSID = WifiSsid.createFromAsciiEncoded("Test SSID");
 
     private OsuNetworkConnection mNetworkConnection;
@@ -164,7 +165,7 @@ public class OsuNetworkConnectionTest {
     public void verifyNetworkConnectionWhenWifiIsDisabled() {
         when(mWifiManager.isWifiEnabled()).thenReturn(false);
         mNetworkConnection.init(mHandler);
-        assertEquals(false, mNetworkConnection.connect(TEST_SSID, TEST_NAI));
+        assertEquals(false, mNetworkConnection.connect(TEST_SSID, TEST_NAI, TEST_PROVIDER_NAME));
     }
 
     /**
@@ -173,7 +174,8 @@ public class OsuNetworkConnectionTest {
     @Test
     public void verifyOSENUnsupported() {
         mNetworkConnection.init(mHandler);
-        assertEquals(false, mNetworkConnection.connect(TEST_SSID, TEST_NAI_OSEN));
+        assertEquals(false,
+                mNetworkConnection.connect(TEST_SSID, TEST_NAI_OSEN, TEST_PROVIDER_NAME));
     }
 
     /**
@@ -184,7 +186,7 @@ public class OsuNetworkConnectionTest {
     public void verifyNetworkConnectionWhenAddNetworkFails() {
         when(mWifiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(-1);
         mNetworkConnection.init(mHandler);
-        assertEquals(false, mNetworkConnection.connect(TEST_SSID, TEST_NAI));
+        assertEquals(false, mNetworkConnection.connect(TEST_SSID, TEST_NAI, TEST_PROVIDER_NAME));
         verify(mWifiManager, never()).removeNetwork(TEST_NETWORK_ID);
     }
 
@@ -196,7 +198,7 @@ public class OsuNetworkConnectionTest {
     public void verifyNetworkConnectionWhenEnableNetworkFails() {
         when(mWifiManager.enableNetwork(TEST_NETWORK_ID, true)).thenReturn(false);
         mNetworkConnection.init(mHandler);
-        assertEquals(false, mNetworkConnection.connect(TEST_SSID, TEST_NAI));
+        assertEquals(false, mNetworkConnection.connect(TEST_SSID, TEST_NAI, TEST_PROVIDER_NAME));
         verify(mWifiManager).removeNetwork(TEST_NETWORK_ID);
     }
 
@@ -210,7 +212,7 @@ public class OsuNetworkConnectionTest {
         mNetworkConnection.init(mHandler);
 
         mNetworkConnection.setEventCallback(mNetworkCallbacks);
-        assertEquals(true, mNetworkConnection.connect(TEST_SSID, TEST_NAI));
+        assertEquals(true, mNetworkConnection.connect(TEST_SSID, TEST_NAI, TEST_PROVIDER_NAME));
 
         ArgumentCaptor<ConnectivityManager.NetworkCallback> networkCallbackCaptor =
                 ArgumentCaptor.forClass(ConnectivityManager.NetworkCallback.class);
@@ -240,7 +242,7 @@ public class OsuNetworkConnectionTest {
         mNetworkConnection.init(mHandler);
 
         mNetworkConnection.setEventCallback(mNetworkCallbacks);
-        assertEquals(true, mNetworkConnection.connect(TEST_SSID, TEST_NAI));
+        assertEquals(true, mNetworkConnection.connect(TEST_SSID, TEST_NAI, TEST_PROVIDER_NAME));
 
         ArgumentCaptor<ConnectivityManager.NetworkCallback> networkCallbackCaptor =
                 ArgumentCaptor.forClass(ConnectivityManager.NetworkCallback.class);
@@ -263,7 +265,7 @@ public class OsuNetworkConnectionTest {
         mNetworkConnection.init(mHandler);
 
         mNetworkConnection.setEventCallback(mNetworkCallbacks);
-        assertEquals(true, mNetworkConnection.connect(TEST_SSID, TEST_NAI));
+        assertEquals(true, mNetworkConnection.connect(TEST_SSID, TEST_NAI, TEST_PROVIDER_NAME));
 
         ArgumentCaptor<ConnectivityManager.NetworkCallback> networkCallbackCaptor =
                 ArgumentCaptor.forClass(ConnectivityManager.NetworkCallback.class);
@@ -290,7 +292,7 @@ public class OsuNetworkConnectionTest {
     @Test
     public void verifyNetworkDisconnect() {
         mNetworkConnection.init(mHandler);
-        assertEquals(true, mNetworkConnection.connect(TEST_SSID, TEST_NAI));
+        assertEquals(true, mNetworkConnection.connect(TEST_SSID, TEST_NAI, TEST_PROVIDER_NAME));
 
         mNetworkConnection.disconnectIfNeeded();
 
@@ -308,7 +310,7 @@ public class OsuNetworkConnectionTest {
     public void verifyWifiConfigurationForOsuNetwork() {
         mNetworkConnection.init(mHandler);
 
-        assertEquals(true, mNetworkConnection.connect(TEST_SSID, TEST_NAI));
+        assertEquals(true, mNetworkConnection.connect(TEST_SSID, TEST_NAI, TEST_PROVIDER_NAME));
 
         ArgumentCaptor<WifiConfiguration> wifiConfigurationCaptor = ArgumentCaptor.forClass(
                 WifiConfiguration.class);
diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProvisionerTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProvisionerTest.java
index d1ad8bfd9..0dcf5224c 100644
--- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProvisionerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProvisionerTest.java
@@ -220,7 +220,7 @@ public class PasspointProvisionerTest {
                 .getSystemService(eq(Context.WIFI_SERVICE));
         mPasspointProvisioner = new PasspointProvisioner(mContext, mWifiNative, mObjectFactory,
                 mPasspointManager);
-        when(mOsuNetworkConnection.connect(any(WifiSsid.class), any())).thenReturn(true);
+        when(mOsuNetworkConnection.connect(any(WifiSsid.class), any(), any())).thenReturn(true);
         when(mOsuServerConnection.connect(any(URL.class), any(Network.class))).thenReturn(true);
         when(mOsuServerConnection.validateProvider(any(Locale.class),
                 any(String.class))).thenReturn(true);
@@ -500,7 +500,7 @@ public class PasspointProvisionerTest {
         ArgumentCaptor<WifiSsid> wifiSsidArgumentCaptor = ArgumentCaptor.forClass(WifiSsid.class);
 
         verify(mOsuNetworkConnection, atLeastOnce()).connect(wifiSsidArgumentCaptor.capture(),
-                any(String.class));
+                any(String.class), any(String.class));
         assertEquals(TEST_OSU_SSID3, wifiSsidArgumentCaptor.getValue());
     }
 
@@ -524,7 +524,7 @@ public class PasspointProvisionerTest {
      */
     @Test
     public void verifyConnectAttemptFailure() throws RemoteException {
-        when(mOsuNetworkConnection.connect(any(WifiSsid.class), any())).thenReturn(false);
+        when(mOsuNetworkConnection.connect(any(WifiSsid.class), any(), any())).thenReturn(false);
         initAndStartProvisioning();
 
         // Since connection attempt fails, directly move to FAILED_STATE