summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2018-07-12 16:08:14 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-07-12 16:08:14 -0700
commitc8465fb947e1f9e7739c5686bf90bf12624af392 (patch)
tree02a05c2a76dd377bb06b55fe79de3e02db246719 /tests
parent0113c2ba129f57d166cf7a9e2a57afa2815cd3ab (diff)
parent7d4d330480b2fe006fbb9f14d012d837b9504cb1 (diff)
Merge "Update SubscriptionInfo constructor" am: af9d175bb1
am: 7d4d330480 Change-Id: I1c02b54a397aee40bdb81b02928423fab9b65cd6
Diffstat (limited to 'tests')
-rw-r--r--tests/wifitests/src/com/android/server/wifi/CarrierNetworkConfigTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/CarrierNetworkConfigTest.java b/tests/wifitests/src/com/android/server/wifi/CarrierNetworkConfigTest.java
index d45edcdc4..de8c824fe 100644
--- a/tests/wifitests/src/com/android/server/wifi/CarrierNetworkConfigTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/CarrierNetworkConfigTest.java
@@ -58,7 +58,7 @@ public class CarrierNetworkConfigTest {
private static final String TEST_CARRIER_NAME = "Test Carrier";
private static final SubscriptionInfo TEST_SUBSCRIPTION_INFO =
new SubscriptionInfo(TEST_SUBSCRIPTION_ID, null, 0, TEST_CARRIER_NAME, null, 0, 0,
- null, 0, null, 0, 0, null);
+ null, 0, null, "0", "0", null);
@Mock Context mContext;
@Mock CarrierConfigManager mCarrierConfigManager;
@@ -192,7 +192,7 @@ public class CarrierNetworkConfigTest {
int updatedInternalEapType = WifiEnterpriseConfig.Eap.AKA;
String updatedCarrierName = "Updated Carrier";
SubscriptionInfo updatedSubscriptionInfo = new SubscriptionInfo(TEST_SUBSCRIPTION_ID,
- null, 0, updatedCarrierName, null, 0, 0, null, 0, null, 0, 0, null);
+ null, 0, updatedCarrierName, null, 0, 0, null, 0, null, "0", "0", null);
when(mSubscriptionManager.getActiveSubscriptionInfoList())
.thenReturn(Arrays.asList(new SubscriptionInfo[] {updatedSubscriptionInfo}));
when(mCarrierConfigManager.getConfigForSubId(TEST_SUBSCRIPTION_ID))