commit a8bf706293543bd88aebd2e7c27da9d0befb0929
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 16 18:59:16 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 16 18:59:16 2022 +0000
tree bc007da0cb41c2c0abad75cf84e083f3ccc4273f
parent 5711f9e6aef9bbbbeef0029bfd644b9f1efd0078
parent 7b92ff221a427d19fa58f86723529eabd993198d

Merge "Autogenerate connectivity jarjar rules" into tm-dev

service/Android.bp

diff --git a/service/Android.bp b/service/Android.bp
index 0dc00df..0393c79 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -169,7 +169,7 @@
         "networkstack-client",
         "PlatformProperties",
         "service-connectivity-protos",
-        "NetworkStackApiCurrentShims",
+        "NetworkStackApiStableShims",
     ],
     apex_available: [
         "com.android.tethering",

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
+}