Snap for 8794174 from fa2b95fe14531e47bb10f89df3f7188f9641912f to tm-qpr1-release (9e1915e3) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/data/DataProfileManager.java

+22 −10

Original line number	Diff line number	Diff line
		@@ -77,6 +77,13 @@ public class DataProfileManager extends Handler {
		private final String mLogTag;
		private final LocalLog mLocalLog = new LocalLog(128);

		/**
		* Should only be used by update updateDataProfiles() to indicate whether resend IA to modem
		* regardless whether IA changed.
		**/
		private final boolean FORCED_UPDATE_IA = true;
		private final boolean ONLY_UPDATE_IA_IF_CHANGED = false;

		/** Data network controller. */
		private final @NonNull DataNetworkController mDataNetworkController;

		@@ -182,11 +189,11 @@ public class DataProfileManager extends Handler {
		switch (msg.what) {
		case EVENT_SIM_REFRESH:
		log("Update data profiles due to SIM refresh.");
		updateDataProfiles();
		updateDataProfiles(FORCED_UPDATE_IA);
		break;
		case EVENT_APN_DATABASE_CHANGED:
		log("Update data profiles due to APN db updated.");
		updateDataProfiles();
		updateDataProfiles(ONLY_UPDATE_IA_IF_CHANGED);
		break;
		default:
		loge("Unexpected event " + msg);
		@@ -199,7 +206,7 @@ public class DataProfileManager extends Handler {
		*/
		private void onCarrierConfigUpdated() {
		log("Update data profiles due to carrier config updated.");
		updateDataProfiles();
		updateDataProfiles(FORCED_UPDATE_IA);

		//TODO: more works needed to be done here.
		}
		@@ -237,8 +244,10 @@ public class DataProfileManager extends Handler {
		/**
		* Update all data profiles, including preferred data profile, and initial attach data profile.
		* Also send those profiles down to the modem if needed.
		*
		* @param forceUpdateIa If {@code true}, we should always send IA again to modem.
		*/
		private void updateDataProfiles() {
		private void updateDataProfiles(boolean forceUpdateIa) {
		List<DataProfile> profiles = new ArrayList<>();
		if (mDataConfigManager.isConfigCarrierSpecific()) {
		Cursor cursor = mPhone.getContext().getContentResolver().query(
		@@ -345,7 +354,7 @@ public class DataProfileManager extends Handler {
		}

		updateDataProfilesAtModem();
		updateInitialAttachDataProfileAtModem();
		updateInitialAttachDataProfileAtModem(forceUpdateIa);

		if (profilesChanged) {
		mDataProfileManagerCallbacks.forEach(callback -> callback.invokeFromExecutor(
		@@ -403,7 +412,7 @@ public class DataProfileManager extends Handler {
		.orElse(null);
		// Save the preferred data profile into database.
		setPreferredDataProfile(dataProfile);
		updateDataProfiles();
		updateDataProfiles(ONLY_UPDATE_IA_IF_CHANGED);
		}

		/**
		@@ -515,8 +524,10 @@ public class DataProfileManager extends Handler {
		* Some carriers might explicitly require that using "user-added" APN for initial
		* attach. In this case, exception can be configured through
		* {@link CarrierConfigManager#KEY_ALLOWED_INITIAL_ATTACH_APN_TYPES_STRING_ARRAY}.
		*
		* @param forceUpdateIa If {@code true}, we should always send IA again to modem.
		*/
		private void updateInitialAttachDataProfileAtModem() {
		private void updateInitialAttachDataProfileAtModem(boolean forceUpdateIa) {
		DataProfile initialAttachDataProfile = null;

		// Sort the data profiles so the preferred data profile is at the beginning.
		@@ -532,11 +543,12 @@ public class DataProfileManager extends Handler {
		if (initialAttachDataProfile != null) break;
		}

		if (!Objects.equals(mInitialAttachDataProfile, initialAttachDataProfile)) {
		if (forceUpdateIa \|\| !Objects.equals(mInitialAttachDataProfile, initialAttachDataProfile)) {
		mInitialAttachDataProfile = initialAttachDataProfile;
		logl("Initial attach data profile updated as " + mInitialAttachDataProfile);
		logl("Initial attach data profile updated as " + mInitialAttachDataProfile
		+ " or forceUpdateIa= " + forceUpdateIa);
		// TODO: Push the null data profile to modem on new AIDL HAL. Modem should clear the IA
		// APN.
		// APN, tracking for U b/227579876, now using forceUpdateIa which always push to modem
		if (mInitialAttachDataProfile != null) {
		mWwanDataServiceManager.setInitialAttachApn(mInitialAttachDataProfile,
		mPhone.getServiceState().getDataRoamingFromRegistration(), null);

tests/telephonytests/src/com/android/internal/telephony/data/DataProfileManagerTest.java

+38 −0

Original line number	Diff line number	Diff line
		@@ -640,6 +640,44 @@ public class DataProfileManagerTest extends TelephonyTest {
		.isEqualTo(GENERAL_PURPOSE_APN);
		}

		@Test
		public void testSetInitialAttachDataProfileMultipleRequests() throws Exception {
		// Test: Modem Cleared IA, should always send IA to modem
		// TODO(b/237444788): this case should be removed from U
		mDataProfileManagerUT.obtainMessage(3 /* EVENT_SIM_REFRESH */).sendToTarget();
		processAllMessages();

		Field IADPField = DataProfileManager.class.getDeclaredField("mInitialAttachDataProfile");
		IADPField.setAccessible(true);
		DataProfile dp = (DataProfile) IADPField.get(mDataProfileManagerUT);

		Mockito.clearInvocations(mMockedWwanDataServiceManager);
		mDataProfileManagerUT.obtainMessage(3 /* EVENT_SIM_REFRESH */).sendToTarget();
		processAllMessages();
		DataProfile dp2 = (DataProfile) IADPField.get(mDataProfileManagerUT);

		assertThat(Objects.equals(dp, dp2)).isTrue();
		verify(mMockedWwanDataServiceManager)
		.setInitialAttachApn(any(DataProfile.class), eq(false), eq(null));

		// Test: Modem did NOT clear IA, should not send IA to modem even if IA stays the same
		mDataProfileManagerUT.obtainMessage(2 /* EVENT_APN_DATABASE_CHANGED */).sendToTarget();
		processAllMessages();

		IADPField = DataProfileManager.class.getDeclaredField("mInitialAttachDataProfile");
		IADPField.setAccessible(true);
		dp = (DataProfile) IADPField.get(mDataProfileManagerUT);
		Mockito.clearInvocations(mMockedWwanDataServiceManager);

		mDataProfileManagerUT.obtainMessage(2 /* EVENT_APN_DATABASE_CHANGED */).sendToTarget();
		processAllMessages();
		dp2 = (DataProfile) IADPField.get(mDataProfileManagerUT);

		assertThat(Objects.equals(dp, dp2)).isTrue();
		verify(mMockedWwanDataServiceManager, Mockito.never())
		.setInitialAttachApn(any(DataProfile.class), eq(false), eq(null));
		}

		@Test
		public void testSimRemoval() {
		Mockito.clearInvocations(mDataProfileManagerCallback);