summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-26 19:04:02 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-07-26 19:04:02 +0000
commit9ffa12725bacb7f5c29f055e41377f415e564475 (patch)
treecb525d0a4070f061939c518a59e450f86d14ca54
parent2d3e5f9a653166bdcf71b363ee59139a8eec82df (diff)
parentbbdc65890d17a10d3317bc1931747d99c9522848 (diff)
Merge "Merge "Inline Time.TIMEZONE_UTC." am: a092e31b3e am: ce361177f5 am: 5d4265af9b am: f39d439341 am: b758563cfd"
-rw-r--r--core/tests/coretests/src/android/net/NetworkPolicyTest.kt3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/tests/coretests/src/android/net/NetworkPolicyTest.kt b/core/tests/coretests/src/android/net/NetworkPolicyTest.kt
index 6360a2deb544..3ab7fa9bc995 100644
--- a/core/tests/coretests/src/android/net/NetworkPolicyTest.kt
+++ b/core/tests/coretests/src/android/net/NetworkPolicyTest.kt
@@ -22,7 +22,6 @@ import android.net.NetworkTemplate.MATCH_CARRIER
import android.net.NetworkTemplate.MATCH_ETHERNET
import android.net.NetworkTemplate.MATCH_MOBILE
import android.net.NetworkTemplate.MATCH_WIFI
-import android.text.format.Time.TIMEZONE_UTC
import androidx.test.runner.AndroidJUnit4
import org.junit.Test
import org.junit.runner.RunWith
@@ -57,7 +56,7 @@ class NetworkPolicyTest {
}
private fun createTestPolicyForTemplate(template: NetworkTemplate): NetworkPolicy {
- return NetworkPolicy(template, NetworkPolicy.buildRule(5, ZoneId.of(TIMEZONE_UTC)),
+ return NetworkPolicy(template, NetworkPolicy.buildRule(5, ZoneId.of("UTC")),
NetworkPolicy.WARNING_DISABLED, NetworkPolicy.LIMIT_DISABLED,
NetworkPolicy.SNOOZE_NEVER, NetworkPolicy.SNOOZE_NEVER, NetworkPolicy.SNOOZE_NEVER,
/*metered*/ false, /*inferred*/ true)