commit 230767d4d4b52d0be19da9fff9465b2f560e8d72
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Mar 14 08:17:12 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 14 08:17:12 2024 +0000
tree bbe93d2f9d6581f49780f83bbd50b0167d33e8a6
parent 4cd5b9e2d2072dda0e508a0b83d901be29e78f49
parent f7c5d6e642067dd5dbc30798b3dbbe8ae041ec38

Merge "Simplify the logic in the hasServiceTypeClientsForNetwork" into main

tests/cts/net/src/android/net/cts/NsdManagerTest.kt

diff --git a/tests/cts/net/src/android/net/cts/NsdManagerTest.kt b/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
index 8dbcf2f..0daf7fe 100644
--- a/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
+++ b/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
@@ -2199,15 +2199,10 @@
     }
 
     private fun hasServiceTypeClientsForNetwork(clients: List<String>, network: Network): Boolean {
-        for (client in clients) {
-            val netid = client.substring(
-                    client.indexOf("network=") + "network=".length,
-                    client.indexOf("interfaceIndex=") - 1)
-            if (netid == network.toString()) {
-                return true
-            }
+        return clients.any { client -> client.substring(
+                client.indexOf("network=") + "network=".length,
+                client.indexOf("interfaceIndex=") - 1) == network.getNetId().toString()
         }
-        return false
     }
 
     /**