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

Merge "Remove unnecessary usage of deprecated Time class"

Browse Source 
am: 39b253ff6c

Change-Id: Ida6d63d920ac21fb05ba789f45656478dae07c4a
This commit is contained in:
Neil Fuller
2019-06-18 08:20:03 -07:00
committed by android-build-merger
parent e25cc6b0e7 39b253ff6c
commit c80913eea8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java
View File

@@ -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;
@@ -185,6 +183,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;
@@ -223,6 +222,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;
@@ -1771,7 +1771,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);
} }