passpoint-r2: change return type of getMatchingOsuProviders

This change is required to show signal strength with OSU provider name
on UI.

Bug: 119514793
Test: ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: tested with R1 AP for installing profile and R2 AP for connection
Change-Id: Ice99d176353d539e511717ccc7a4aba51d83ed48
Signed-off-by: Ecco Park <eccopark@google.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java
index cf8475ae4..4cf1cd90c 100644
--- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java
@@ -1094,14 +1094,15 @@ public class PasspointManagerTest {
             // ANQP_DOMAIN_ID(TEST_ANQP_KEY)
             vsa.anqpDomainID = TEST_ANQP_DOMAIN_ID;
             when(InformationElementUtil.getHS2VendorSpecificIE(isNull())).thenReturn(vsa);
-            assertThat(mManager.getMatchingOsuProviders(Arrays.asList(createTestScanResult())),
-                    containsInAnyOrder(expectedOsuProvidersForDomainId.toArray()));
+            assertEquals(mManager.getMatchingOsuProviders(
+                    Arrays.asList(createTestScanResult())).keySet(),
+                    expectedOsuProvidersForDomainId);
 
             // ANQP_DOMAIN_ID2(TEST_ANQP_KEY2)
             vsa.anqpDomainID = TEST_ANQP_DOMAIN_ID2;
             when(InformationElementUtil.getHS2VendorSpecificIE(isNull())).thenReturn(vsa);
-            assertThat(mManager.getMatchingOsuProviders(createTestScanResults()),
-                    containsInAnyOrder(expectedOsuProvidersForDomainId2.toArray()));
+            assertEquals(mManager.getMatchingOsuProviders(
+                    createTestScanResults()).keySet(), expectedOsuProvidersForDomainId2);
         } finally {
             session.finishMocking();
         }