summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2018-07-12 15:23:07 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-07-12 15:23:07 -0700
commit7d4d330480b2fe006fbb9f14d012d837b9504cb1 (patch)
tree4ead5d2dcf1fea0e1b1de336cb7ef3ac75eb935b
parent681f11a7b2157179d889ca4bf25dcdb997d1f85d (diff)
parentaf9d175bb129de412920f9da7c580c71a24a8a7c (diff)
downloadwifi-7d4d330480b2fe006fbb9f14d012d837b9504cb1.tar.gz
Merge "Update SubscriptionInfo constructor"
am: af9d175bb1 Change-Id: I2dee078abcf09087a17b59c00512430d3ba8661e
-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))