Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f39d4393 authored by Almaz Mingaleev's avatar Almaz Mingaleev Committed by Automerger Merge Worker
Browse files

Merge "Inline Time.TIMEZONE_UTC." am: a092e31b am: ce361177 am: 5d4265af 

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



Change-Id: Ib099befe3e91f433ad00b94ec091e207342e2874
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d723156c 5d4265af

core/tests/coretests/src/android/net/NetworkPolicyTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -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)