commit af9d175bb129de412920f9da7c580c71a24a8a7c
author Hall Liu <hallliu@google.com> Thu Jul 12 21:13:16 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 12 21:13:16 2018 +0000
tree afc9525856c4adeb8d8583856f94f8a8cee83cc2
parent 062203dc24be0b88f4e3b1feef0d2d00ef9979dd
parent 3bbc9705b8570e6f409fb2bb7c9eb7c9cd87ad7f

Merge "Update SubscriptionInfo constructor"

tests/wifitests/src/com/android/server/wifi/CarrierNetworkConfigTest.java

diff --git a/tests/wifitests/src/com/android/server/wifi/CarrierNetworkConfigTest.java b/tests/wifitests/src/com/android/server/wifi/CarrierNetworkConfigTest.java
index f8d2e52..0581a5a 100644
--- a/tests/wifitests/src/com/android/server/wifi/CarrierNetworkConfigTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/CarrierNetworkConfigTest.java
@@ -52,7 +52,7 @@
     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;
@@ -139,7 +139,7 @@
         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))