Merge "Revert to previous constant value for ApnSetting.TYPE_DEFAULT." (7e7327aa) · Commits · e / os / android_frameworks_opt_telephony

tests/telephonytests/src/com/android/internal/telephony/dataconnection/ApnSettingTest.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -293,7 +293,7 @@ public class ApnSettingTest extends TelephonyTest {
	ApnSetting.TYPE_DEFAULT, ApnSetting.PROTOCOL_IPV6, ApnSetting.PROTOCOL_IP, true,		ApnSetting.TYPE_DEFAULT, ApnSetting.PROTOCOL_IPV6, ApnSetting.PROTOCOL_IP, true,
	4096, 0, false, 0, 0, 0, 0, ApnSetting.MVNO_TYPE_SPN, "");		4096, 0, false, 0, 0, 0, 0, ApnSetting.MVNO_TYPE_SPN, "");
	String expected = "[ApnSettingV6] Name, 99, 12345, apn, null, "		String expected = "[ApnSettingV6] Name, 99, 12345, apn, null, "
	+ "null, null, null, 10, 0, default, "		+ "null, null, null, 10, 0, hipri \| default, "
	+ "IPV6, IP, true, 0, false, 0, 0, 0, 0, spn, , false, 4096, 0, -1";		+ "IPV6, IP, true, 0, false, 0, 0, 0, 0, spn, , false, 4096, 0, -1";
	assertEquals(expected, apn.toString());		assertEquals(expected, apn.toString());

	@@ -304,7 +304,7 @@ public class ApnSettingTest extends TelephonyTest {
	ApnSetting.TYPE_DEFAULT, ApnSetting.PROTOCOL_IPV6, ApnSetting.PROTOCOL_IP, true,		ApnSetting.TYPE_DEFAULT, ApnSetting.PROTOCOL_IPV6, ApnSetting.PROTOCOL_IP, true,
	networkTypeBitmask, 0, false, 0, 0, 0, 0, ApnSetting.MVNO_TYPE_SPN, "", 3, -1);		networkTypeBitmask, 0, false, 0, 0, 0, 0, ApnSetting.MVNO_TYPE_SPN, "", 3, -1);
	expected = "[ApnSettingV6] Name, 99, 12345, apn, null, "		expected = "[ApnSettingV6] Name, 99, 12345, apn, null, "
	+ "null, null, null, 10, 0, default, "		+ "null, null, null, 10, 0, hipri \| default, "
	+ "IPV6, IP, true, 0, false, 0, 0, 0, 0, spn, , false, 8192, 3, -1";		+ "IPV6, IP, true, 0, false, 0, 0, 0, 0, spn, , false, 8192, 3, -1";
	assertEquals(expected, apn.toString());		assertEquals(expected, apn.toString());
	}		}

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -596,7 +596,7 @@ public class DcTrackerTest extends TelephonyTest {
	mServiceState.getRilDataRadioTechnology())), dpCaptor.capture(),		mServiceState.getRilDataRadioTechnology())), dpCaptor.capture(),
	eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),		eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),
	any(Message.class));		any(Message.class));
	verifyDataProfile(dpCaptor.getValue(), FAKE_APN1, 0, 5, 1, LTE_BEARER_BITMASK);		verifyDataProfile(dpCaptor.getValue(), FAKE_APN1, 0, 21, 1, LTE_BEARER_BITMASK);

	verifyDataConnected(FAKE_APN1);		verifyDataConnected(FAKE_APN1);
	}		}
	@@ -645,7 +645,7 @@ public class DcTrackerTest extends TelephonyTest {
	mServiceState.getRilDataRadioTechnology())), dpCaptor.capture(),		mServiceState.getRilDataRadioTechnology())), dpCaptor.capture(),
	eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),		eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),
	any(Message.class));		any(Message.class));
	verifyDataProfile(dpCaptor.getValue(), FAKE_APN1, 0, 5, 1, LTE_BEARER_BITMASK);		verifyDataProfile(dpCaptor.getValue(), FAKE_APN1, 0, 21, 1, LTE_BEARER_BITMASK);

	// Verify the retry manger schedule another data call setup.		// Verify the retry manger schedule another data call setup.
	verify(mAlarmManager, times(1)).setExact(eq(AlarmManager.ELAPSED_REALTIME_WAKEUP),		verify(mAlarmManager, times(1)).setExact(eq(AlarmManager.ELAPSED_REALTIME_WAKEUP),
	@@ -670,7 +670,7 @@ public class DcTrackerTest extends TelephonyTest {
	mServiceState.getRilDataRadioTechnology())), dpCaptor.capture(),		mServiceState.getRilDataRadioTechnology())), dpCaptor.capture(),
	eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),		eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),
	any(Message.class));		any(Message.class));
	verifyDataProfile(dpCaptor.getValue(), FAKE_APN2, 0, 5, 1, LTE_BEARER_BITMASK);		verifyDataProfile(dpCaptor.getValue(), FAKE_APN2, 0, 21, 1, LTE_BEARER_BITMASK);

	// Verify connected with APN2 setting.		// Verify connected with APN2 setting.
	verifyDataConnected(FAKE_APN2);		verifyDataConnected(FAKE_APN2);
	@@ -751,7 +751,7 @@ public class DcTrackerTest extends TelephonyTest {
	mServiceState.getRilDataRadioTechnology())), dpCaptor.capture(),		mServiceState.getRilDataRadioTechnology())), dpCaptor.capture(),
	eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),		eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),
	any(Message.class));		any(Message.class));
	verifyDataProfile(dpCaptor.getValue(), FAKE_APN1, 0, 5, 1, LTE_BEARER_BITMASK);		verifyDataProfile(dpCaptor.getValue(), FAKE_APN1, 0, 21, 1, LTE_BEARER_BITMASK);

	//user is in roaming		//user is in roaming
	doReturn(true).when(mServiceState).getDataRoaming();		doReturn(true).when(mServiceState).getDataRoaming();
	@@ -1205,7 +1205,7 @@ public class DcTrackerTest extends TelephonyTest {
	mServiceState.getRilDataRadioTechnology())), dpCaptor.capture(),		mServiceState.getRilDataRadioTechnology())), dpCaptor.capture(),
	eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),		eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),
	any(Message.class));		any(Message.class));
	verifyDataProfile(dpCaptor.getValue(), FAKE_APN4, 0, 5, 2, EHRPD_BEARER_BITMASK);		verifyDataProfile(dpCaptor.getValue(), FAKE_APN4, 0, 21, 2, EHRPD_BEARER_BITMASK);
	assertEquals(DctConstants.State.CONNECTED, mDct.getOverallState());		assertEquals(DctConstants.State.CONNECTED, mDct.getOverallState());

	//data rat change from ehrpd to lte		//data rat change from ehrpd to lte