commit 5711f9e6aef9bbbbeef0029bfd644b9f1efd0078
author Remi NGUYEN VAN <reminv@google.com> Mon May 02 14:53:22 2022 +0900
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Mon May 16 12:58:27 2022 +0000
tree 55f36a2a77682b9faac797ccddbcf07bcad8c76c
parent 14fb2f4e8a07dc457ebee74bbb8f95db9f1ec453

Remove NetworkIdentitySet usage in CTS

NetworkIdentitySet is hidden API and may change on subsequent module
updates.
Use the module_lib NetworkStatsCollection.Key constructor that uses a
set of NetworkIdentity instead.

Bug: 217129444
Test: atest NetworkStatsCollectionTest
Change-Id: Icd1160ae920059306c3319f7298707f1e14cbb48
(cherry picked from commit 7b0c61d0bd906d88677a7f3c4d8b3f7e8a0cd4bc)
Merged-In: Icd1160ae920059306c3319f7298707f1e14cbb48

tests/common/java/android/net/netstats/NetworkStatsCollectionTest.kt

diff --git a/tests/common/java/android/net/netstats/NetworkStatsCollectionTest.kt b/tests/common/java/android/net/netstats/NetworkStatsCollectionTest.kt
index ca0e5ed..368a519 100644
--- a/tests/common/java/android/net/netstats/NetworkStatsCollectionTest.kt
+++ b/tests/common/java/android/net/netstats/NetworkStatsCollectionTest.kt
@@ -16,7 +16,7 @@
 
 package android.net.netstats
 
-import android.net.NetworkIdentitySet
+import android.net.NetworkIdentity
 import android.net.NetworkStatsCollection
 import android.net.NetworkStatsHistory
 import androidx.test.filters.SmallTest
@@ -40,7 +40,7 @@
 
     @Test
     fun testBuilder() {
-        val ident = NetworkIdentitySet()
+        val ident = setOf<NetworkIdentity>()
         val key1 = NetworkStatsCollection.Key(ident, /* uid */ 0, /* set */ 0, /* tag */ 0)
         val key2 = NetworkStatsCollection.Key(ident, /* uid */ 1, /* set */ 0, /* tag */ 0)
         val bucketDuration = 10L
@@ -63,4 +63,4 @@
         val actualHistory = actualEntries[key1] ?: fail("There should be an entry for $key1")
         assertEquals(history1.entries, actualHistory.entries)
     }
-}
\ No newline at end of file
+}