Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Inline Time.TIMEZONE_UTC." am: a092e31b3e am: ce361177f5 am: 5d4265af9b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2165722

Change-Id: Ib099befe3e91f433ad00b94ec091e207342e2874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Almaz Mingaleev
2022-07-26 17:39:03 +00:00
committed by Automerger Merge Worker
parent d723156cbc 5d4265af9b
commit f39d439341
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/tests/coretests/src/android/net/NetworkPolicyTest.kt
View File

@@ -22,7 +22,6 @@ import android.net.NetworkTemplate.MATCH_CARRIER
import android.net.NetworkTemplate.MATCH_ETHERNET import android.net.NetworkTemplate.MATCH_ETHERNET
import android.net.NetworkTemplate.MATCH_MOBILE import android.net.NetworkTemplate.MATCH_MOBILE
import android.net.NetworkTemplate.MATCH_WIFI import android.net.NetworkTemplate.MATCH_WIFI
import android.text.format.Time.TIMEZONE_UTC
import androidx.test.runner.AndroidJUnit4 import androidx.test.runner.AndroidJUnit4
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
@@ -57,7 +56,7 @@ class NetworkPolicyTest {
} }
private fun createTestPolicyForTemplate(template: NetworkTemplate): NetworkPolicy { 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.WARNING_DISABLED, NetworkPolicy.LIMIT_DISABLED,
NetworkPolicy.SNOOZE_NEVER, NetworkPolicy.SNOOZE_NEVER, NetworkPolicy.SNOOZE_NEVER, NetworkPolicy.SNOOZE_NEVER, NetworkPolicy.SNOOZE_NEVER, NetworkPolicy.SNOOZE_NEVER,
/*metered*/ false, /*inferred*/ true) /*metered*/ false, /*inferred*/ true)