From dfb45d6b298b77e7a36495236ef72a6e99869ed5 Mon Sep 17 00:00:00 2001 From: Almaz Mingaleev Date: Tue, 26 Jul 2022 16:20:09 +0100 Subject: [PATCH] Inline Time.TIMEZONE_UTC. Time is deprecated and should not be used. Bug: 16550209 Test: atest FrameworksCoreTests:android.net.NetworkPolicyTest Change-Id: Ib1a29f52982701028e63da2856b9fbb3626244f9 --- core/tests/coretests/src/android/net/NetworkPolicyTest.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/tests/coretests/src/android/net/NetworkPolicyTest.kt b/core/tests/coretests/src/android/net/NetworkPolicyTest.kt index 6360a2deb5444..3ab7fa9bc9959 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)