Snap for 11219529 from af72b58623c0837b74bcada9c683fdf7e748ed89 to mainline-tzdata4-release
Change-Id: I9046e35c0cfc5bdccfadb2a276798dcce9ed9447
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index eaf0b2e..592b271 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -17,7 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="notification_channel_name_connected" msgid="1795068343200033922">"Autentifikacija na zaštitnom portalu"</string>
- <string name="notification_channel_description_connected" msgid="7239184168268014518">"Obavijesti koje se prikazuju kada uređaj uspješno prođe provjeru autentičnosti na mreži zaštitnog portala"</string>
+ <string name="notification_channel_description_connected" msgid="7239184168268014518">"Obavijesti koje se prikazuju kada uređaj uspješno prođe autentifikaciju na mreži zaštitnog portala"</string>
<string name="notification_channel_name_network_venue_info" msgid="6526543187249265733">"Podaci o mrežnom mjestu"</string>
<string name="notification_channel_description_network_venue_info" msgid="5131499595382733605">"Obavijesti koje se prikazuju kada mreža ima stranicu s podacima o mjestu događaja"</string>
<string name="connected" msgid="4563643884927480998">"Povezano"</string>
diff --git a/tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt b/tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt
index f1cbd21..c50b799 100644
--- a/tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt
+++ b/tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt
@@ -20,9 +20,13 @@
import android.app.usage.NetworkStats
import android.app.usage.NetworkStats.Bucket.TAG_NONE
import android.app.usage.NetworkStatsManager
+import android.net.ConnectivityManager.TYPE_TEST
import android.net.NetworkTemplate.MATCH_TEST
+import android.os.Build
import android.os.Process
import androidx.test.platform.app.InstrumentationRegistry
+import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo
+import com.android.testutils.DevSdkIgnoreRunner
import com.android.testutils.PacketBridge
import com.android.testutils.RecorderCallback.CallbackEntry.LinkPropertiesChanged
import com.android.testutils.TestDnsServer
@@ -40,11 +44,13 @@
import kotlin.test.assertEquals
import kotlin.test.assertTrue
import org.junit.After
+import org.junit.Assume.assumeTrue
+import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-@RunWith(JUnit4::class)
+@RunWith(DevSdkIgnoreRunner::class)
+@IgnoreUpTo(Build.VERSION_CODES.TIRAMISU)
class NetworkStatsIntegrationTest {
private val INTERNAL_V6ADDR =
LinkAddress(InetAddresses.parseNumericAddress("2001:db8::1234"), 64)
@@ -73,6 +79,7 @@
}.apply {
start()
}
+ private val cm = context.getSystemService(ConnectivityManager::class.java)
// Set up DNS server for testing server and DNS64.
private val fakeDns = TestDnsServer(
@@ -91,6 +98,19 @@
start()
}
+ @Before
+ fun setUp() {
+ assumeTrue(shouldRunTests())
+ }
+
+ // For networkstack tests, it is not guaranteed that the tethering module will be
+ // updated at the same time. If the tethering module is not new enough, it may not contain
+ // the necessary abilities to run these tests. For example, The tests depends on test
+ // network stats being counted, which can only be achieved when they are marked as TYPE_TEST.
+ // If the tethering module does not support TYPE_TEST stats, then these tests will need
+ // to be skipped.
+ fun shouldRunTests() = cm.getNetworkInfo(packetBridge.internalNetwork).type == TYPE_TEST
+
@After
fun tearDown() {
packetBridge.stop()
@@ -99,7 +119,6 @@
}
private fun waitFor464XlatReady(network: Network): String {
- val cm = context.getSystemService(ConnectivityManager::class.java)
val iface = cm.getLinkProperties(network).interfaceName
// Make a network request to listen to the specific test network.