diff options
| author | 2022-07-26 19:03:23 +0000 | |
|---|---|---|
| committer | 2022-07-26 19:03:23 +0000 | |
| commit | bbdc65890d17a10d3317bc1931747d99c9522848 (patch) | |
| tree | 4022f0a3e2a083b3b98c1bdd17e1f27a5d0e5d4f | |
| parent | ce25c63de9b67d0630c884dc953b2c0c50e92534 (diff) | |
| parent | b758563cfd5f9d7532fb777106a906e30f9f7dec (diff) | |
Merge "Inline Time.TIMEZONE_UTC." am: a092e31b3e am: ce361177f5 am: 5d4265af9b am: f39d439341 am: b758563cfd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2165722
Change-Id: I9cab5b173226772b558c9c2d2a59a4fe1c914713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/tests/coretests/src/android/net/NetworkPolicyTest.kt | 3 |
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) |