Merge "Use updated SubscriptionInfo constructor." (d5fe38a8) · Commits · e / os / android_frameworks_opt_telephony

tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ public class SubscriptionInfoTest {
		@Before
		public void setUp() throws Exception {
		mSubscriptionInfoUT = new SubscriptionInfo(1, "890126042XXXXXXXXXXX", 0, "T-mobile",
		"T-mobile", 0, 255, "12345", 0, null, "310", "260", "156");
		"T-mobile", 0, 255, "12345", 0, null, "310", "260", "156", false, null, null);
		}

		@Test

tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -453,11 +453,11 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest {
		// 1: not embedded, but has matching iccid with an embedded subscription.
		subInfoList.add(new SubscriptionInfo(
		0, "1", 0, "", "", 0, 0, "", 0, null, "0", "0", "", false /* isEmbedded */,
		null /* accessRules */));
		null /* accessRules */, null));
		// 2: embedded but no longer present.
		subInfoList.add(new SubscriptionInfo(
		0, "2", 0, "", "", 0, 0, "", 0, null, "0", "0", "", true /* isEmbedded */,
		null /* accessRules */));
		null /* accessRules */, null));

		when(mSubscriptionController.getSubscriptionInfoListForEmbeddedSubscriptionUpdate(
		new String[] { "1", "3"}, false /* removable */)).thenReturn(subInfoList);
		@@ -504,11 +504,11 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest {
		// 1: not embedded, but has matching iccid with an embedded subscription.
		subInfoList.add(new SubscriptionInfo(
		0, "1", 0, "", "", 0, 0, "", 0, null, "0", "0", "", false /* isEmbedded */,
		null /* accessRules */));
		null /* accessRules */, null));
		// 2: embedded.
		subInfoList.add(new SubscriptionInfo(
		0, "2", 0, "", "", 0, 0, "", 0, null, "0", "0", "", true /* isEmbedded */,
		null /* accessRules */));
		null /* accessRules */, null));

		when(mSubscriptionController.getSubscriptionInfoListForEmbeddedSubscriptionUpdate(
		new String[0], false /* removable */)).thenReturn(subInfoList);
		@@ -546,7 +546,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest {
		// 1: not embedded.
		subInfoList.add(new SubscriptionInfo(
		0, "1", 0, "", "", 0, 0, "", 0, null, "0", "0", "", false /* isEmbedded */,
		null /* accessRules */));
		null /* accessRules */, null));

		when(mSubscriptionController.getSubscriptionInfoListForEmbeddedSubscriptionUpdate(
		new String[0], false /* removable */)).thenReturn(subInfoList);

tests/telephonytests/src/com/android/internal/telephony/euicc/EuiccControllerTest.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -838,7 +838,7 @@ public class EuiccControllerTest extends TelephonyTest {
		throws Exception {
		SubscriptionInfo subInfo = new SubscriptionInfo(
		0, "", 0, "", "", 0, 0, "", 0, null, "0", "0", "", true /* isEmbedded */,
		hasPrivileges ? new UiccAccessRule[] { ACCESS_RULE } : null);
		hasPrivileges ? new UiccAccessRule[] { ACCESS_RULE } : null, null);
		when(mSubscriptionManager.canManageSubscription(subInfo, PACKAGE_NAME)).thenReturn(
		hasPrivileges);
		when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
		@@ -848,7 +848,8 @@ public class EuiccControllerTest extends TelephonyTest {
		private void prepareOperationSubscription(boolean hasPrivileges) throws Exception {
		SubscriptionInfo subInfo = new SubscriptionInfo(
		SUBSCRIPTION_ID, ICC_ID, 0, "", "", 0, 0, "", 0, null, "0", "0", "",
		true /* isEmbedded */, hasPrivileges ? new UiccAccessRule[] { ACCESS_RULE } : null);
		true /* isEmbedded */, hasPrivileges ? new UiccAccessRule[] { ACCESS_RULE } : null,
		null);
		when(mSubscriptionManager.canManageSubscription(subInfo, PACKAGE_NAME)).thenReturn(
		hasPrivileges);
		when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn(