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

Commit 29c9e33c authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary usage of deprecated Time class" into qt-dev-plus-aosp

parents f7dc1260 d5f0a399

services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -49,7 +49,6 @@ import static android.telephony.CarrierConfigManager.KEY_DATA_WARNING_THRESHOLD_ 
import static android.telephony.CarrierConfigManager.KEY_MONTHLY_DATA_CYCLE_DAY_INT;

import static android.telephony.CarrierConfigManager.KEY_MONTHLY_DATA_CYCLE_DAY_INT;

import static android.telephony.SubscriptionPlan.BYTES_UNLIMITED;

import static android.telephony.SubscriptionPlan.BYTES_UNLIMITED;

import static android.telephony.SubscriptionPlan.LIMIT_BEHAVIOR_DISABLED;

import static android.telephony.SubscriptionPlan.LIMIT_BEHAVIOR_DISABLED;

import static android.text.format.Time.TIMEZONE_UTC;





import static com.android.server.net.NetworkPolicyManagerInternal.QUOTA_TYPE_JOBS;

import static com.android.server.net.NetworkPolicyManagerInternal.QUOTA_TYPE_JOBS;

import static com.android.server.net.NetworkPolicyManagerInternal.QUOTA_TYPE_MULTIPATH;

import static com.android.server.net.NetworkPolicyManagerInternal.QUOTA_TYPE_MULTIPATH;
@@ -128,7 +127,6 @@ import android.telephony.SubscriptionPlan; 
import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.MediumTest;

import android.text.TextUtils;

import android.text.TextUtils;

import android.text.format.Time;

import android.util.DataUnit;

import android.util.DataUnit;

import android.util.Log;

import android.util.Log;

import android.util.Pair;

import android.util.Pair;
@@ -184,6 +182,7 @@ import java.util.Calendar; 
import java.util.Iterator;

import java.util.Iterator;

import java.util.LinkedHashSet;

import java.util.LinkedHashSet;

import java.util.List;

import java.util.List;

import java.util.TimeZone;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.ExecutionException;

import java.util.concurrent.ExecutionException;

import java.util.concurrent.Future;

import java.util.concurrent.Future;
@@ -213,6 +212,7 @@ public class NetworkPolicyManagerServiceTest { 
     * Path on assets where files used by {@link NetPolicyXml} are located.

     * Path on assets where files used by {@link NetPolicyXml} are located.

     */

     */

    private static final String NETPOLICY_DIR = "NetworkPolicyManagerServiceTest/netpolicy";

    private static final String NETPOLICY_DIR = "NetworkPolicyManagerServiceTest/netpolicy";

    private static final String TIMEZONE_UTC = "UTC";





    private BroadcastInterceptingContext mServiceContext;

    private BroadcastInterceptingContext mServiceContext;

    private File mPolicyDir;

    private File mPolicyDir;
@@ -1796,7 +1796,7 @@ public class NetworkPolicyManagerServiceTest { 
    private static NetworkPolicy buildFakeMobilePolicy(int cycleDay, long warningBytes,

    private static NetworkPolicy buildFakeMobilePolicy(int cycleDay, long warningBytes,

            long limitBytes, boolean inferred) {

            long limitBytes, boolean inferred) {

        final NetworkTemplate template = buildTemplateMobileAll(FAKE_SUBSCRIBER_ID);

        final NetworkTemplate template = buildTemplateMobileAll(FAKE_SUBSCRIBER_ID);

        return new NetworkPolicy(template, cycleDay, new Time().timezone, warningBytes,

        return new NetworkPolicy(template, cycleDay, TimeZone.getDefault().getID(), warningBytes,

                limitBytes, SNOOZE_NEVER, SNOOZE_NEVER, true, inferred);

                limitBytes, SNOOZE_NEVER, SNOOZE_NEVER, true, inferred);

    }

    }