Merge "Use new SubscriptionInfo constructor"

am: e8e24e7e0b

Change-Id: I1e51d7951cc3594685c9dd2e0b4c0e2aedb3e84f
This commit is contained in:
Xiangyu/Malcolm Chen
2018-08-14 13:59:07 -07:00
committed by android-build-merger

View File

@@ -324,7 +324,7 @@ public class DataUsageSummaryPreferenceControllerTest {
mActivity, null, null, null); mActivity, null, null, null);
final SubscriptionInfo subInfo = new SubscriptionInfo(0, "123456", 0, "name", "carrier", final SubscriptionInfo subInfo = new SubscriptionInfo(0, "123456", 0, "name", "carrier",
0, 0, "number", 0, null, "123", "456", "ZX"); 0, 0, "number", 0, null, "123", "456", "ZX", false, null, null);
when(mSubscriptionManager.getDefaultDataSubscriptionInfo()).thenReturn(subInfo); when(mSubscriptionManager.getDefaultDataSubscriptionInfo()).thenReturn(subInfo);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
} }