release-request-ca4ad653-1655-436a-b65c-2527b02ae5f2-for-git_oc-mr1-release-42... (1712aa5b) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+10 −11

Original line number	Diff line number	Diff line
		@@ -2278,18 +2278,17 @@ public class GsmCdmaPhone extends Phone {
		break;

		case EVENT_SIM_RECORDS_LOADED:
		if (isPhoneTypeGsm()) {
		updateCurrentCarrierInProvider();

		// Check if this is a different SIM than the previous one. If so unset the
		// voice mail number.
		String imsi = getVmSimImsi();
		String imsiFromSIM = getSubscriberId();
		if (imsi != null && imsiFromSIM != null && !imsiFromSIM.equals(imsi)) {
		if ((!isPhoneTypeGsm() \|\| imsi != null) && imsiFromSIM != null
		&& !imsiFromSIM.equals(imsi)) {
		storeVoiceMailNumber(null);
		setVmSimImsi(null);
		}
		}

		mSimRecordsLoadedRegistrants.notifyRegistrants();
		break;

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

+30 −6

Original line number	Diff line number	Diff line
		@@ -203,6 +203,13 @@ public class SubscriptionInfoUpdater extends Handler {
		sendMessage(obtainMessage(EVENT_SIM_IO_ERROR, slotIndex, -1));
		} else if (IccCardConstants.INTENT_VALUE_ICC_CARD_RESTRICTED.equals(simStatus)) {
		sendMessage(obtainMessage(EVENT_SIM_RESTRICTED, slotIndex, -1));
		} else if (IccCardConstants.INTENT_VALUE_ICC_NOT_READY.equals(simStatus)) {
		// ICC_NOT_READY is a terminal state for an eSIM on the boot profile. At this
		// phase, the subscription list is accessible.
		// TODO(b/64216093): Clean up this special case, likely by treating NOT_READY
		// as equivalent to ABSENT, once the rest of the system can handle it. Currently
		// this breaks SystemUI which shows a "No SIM" icon.
		sendEmptyMessage(EVENT_REFRESH_EMBEDDED_SUBSCRIPTIONS);
		} else {
		logd("Ignoring simStatus: " + simStatus);
		}
		@@ -326,8 +333,7 @@ public class SubscriptionInfoUpdater extends Handler {
		break;

		case EVENT_REFRESH_EMBEDDED_SUBSCRIPTIONS:
		if (isAllIccIdQueryDone()) {
		updateEmbeddedSubscriptions();
		if (updateEmbeddedSubscriptions()) {
		SubscriptionController.getInstance().notifySubscriptionInfoChanged();
		}
		if (msg.obj != null) {
		@@ -671,26 +677,33 @@ public class SubscriptionInfoUpdater extends Handler {
		mSubscriptionManager.setDefaultDataSubId(
		mSubscriptionManager.getDefaultDataSubscriptionId());

		// No need to check return value here as we notify for the above changes anyway.
		updateEmbeddedSubscriptions();

		SubscriptionController.getInstance().notifySubscriptionInfoChanged();
		logd("updateSubscriptionInfoByIccId:- SubscriptionInfo update complete");
		}

		/** Update the cached list of embedded subscriptions. */
		/**
		* Update the cached list of embedded subscriptions.
		*
		* @return true if changes may have been made. This is not a guarantee that changes were made,
		* but notifications about subscription changes may be skipped if this returns false as an
		* optimization to avoid spurious notifications.
		*/
		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
		public void updateEmbeddedSubscriptions() {
		public boolean updateEmbeddedSubscriptions() {
		// Do nothing if eUICCs are disabled. (Previous entries may remain in the cache, but they
		// are filtered out of list calls as long as EuiccManager.isEnabled returns false).
		if (!mEuiccManager.isEnabled()) {
		return;
		return false;
		}

		GetEuiccProfileInfoListResult result =
		EuiccController.get().blockingGetEuiccProfileInfoList();
		if (result == null) {
		// IPC to the eUICC controller failed.
		return;
		return false;
		}

		final EuiccProfileInfo[] embeddedProfiles;
		@@ -710,6 +723,13 @@ public class SubscriptionInfoUpdater extends Handler {
		embeddedIccids[i] = embeddedProfiles[i].iccid;
		}

		// Note that this only tracks whether we make any writes to the DB. It's possible this will
		// be set to true for an update even when the row contents remain exactly unchanged from
		// before, since we don't compare against the previous value. Since this is only intended to
		// avoid some spurious broadcasts (particularly for users who don't use eSIM at all), this
		// is fine.
		boolean hasChanges = false;

		// Update or insert records for all embedded subscriptions (except non-removable ones if the
		// current eUICC is non-removable, since we assume these are still accessible though not
		// returned by the eUICC controller).
		@@ -734,6 +754,7 @@ public class SubscriptionInfoUpdater extends Handler {
		values.put(SubscriptionManager.IS_REMOVABLE, isRemovable);
		values.put(SubscriptionManager.DISPLAY_NAME, embeddedProfile.nickname);
		values.put(SubscriptionManager.NAME_SOURCE, SubscriptionManager.NAME_SOURCE_USER_INPUT);
		hasChanges = true;
		contentResolver.update(SubscriptionManager.CONTENT_URI, values,
		SubscriptionManager.ICC_ID + "=\"" + embeddedProfile.iccid + "\"", null);

		@@ -757,11 +778,14 @@ public class SubscriptionInfoUpdater extends Handler {
		+ TextUtils.join(",", iccidsToRemove) + ")";
		ContentValues values = new ContentValues();
		values.put(SubscriptionManager.IS_EMBEDDED, 0);
		hasChanges = true;
		contentResolver.update(SubscriptionManager.CONTENT_URI, values, whereClause, null);

		// refresh Cached Active Subscription Info List
		SubscriptionController.getInstance().refreshCachedActiveSubscriptionInfoList();
		}

		return hasChanges;
		}

		private static int findSubscriptionInfoForIccid(List<SubscriptionInfo> list, String iccid) {

src/java/com/android/internal/telephony/dataconnection/ApnSetting.java

+113 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.telephony.Rlog;
		import android.telephony.ServiceState;
		import android.text.TextUtils;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.Phone;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.RILConstants;
		@@ -33,6 +34,7 @@ import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Objects;

		/**
		* This class represents a apn setting for create PDP link
		@@ -42,6 +44,7 @@ public class ApnSetting {
		static final String LOG_TAG = "ApnSetting";

		private static final boolean DBG = false;
		private static final boolean VDBG = false;

		static final String V2_FORMAT_REGEX = "^\\[ApnSettingV2\\]\\s*";
		static final String V3_FORMAT_REGEX = "^\\[ApnSettingV3\\]\\s*";
		@@ -544,6 +547,116 @@ public class ApnSetting {
		&& mvnoMatchData.equals(other.mvnoMatchData);
		}

		/**
		* Compare two APN settings
		*
		* Note: This method does not compare 'id', 'bearer', 'bearerBitmask'. We only use this for
		* determining if tearing a data call is needed when conditions change. See
		* cleanUpConnectionsOnUpdatedApns in DcTracker.
		*
		* @param o the other object to compare
		* @param isDataRoaming True if the device is on data roaming
		* @return True if the two APN settings are same
		*/
		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
		public boolean equals(Object o, boolean isDataRoaming) {
		if (!(o instanceof ApnSetting)) {
		return false;
		}

		ApnSetting other = (ApnSetting) o;

		return carrier.equals(other.carrier)
		&& numeric.equals(other.numeric)
		&& apn.equals(other.apn)
		&& proxy.equals(other.proxy)
		&& mmsc.equals(other.mmsc)
		&& mmsProxy.equals(other.mmsProxy)
		&& TextUtils.equals(mmsPort, other.mmsPort)
		&& port.equals(other.port)
		&& TextUtils.equals(user, other.user)
		&& TextUtils.equals(password, other.password)
		&& authType == other.authType
		&& Arrays.deepEquals(types, other.types)
		&& typesBitmap == other.typesBitmap
		&& (isDataRoaming \|\| protocol.equals(other.protocol))
		&& (!isDataRoaming \|\| roamingProtocol.equals(other.roamingProtocol))
		&& carrierEnabled == other.carrierEnabled
		&& profileId == other.profileId
		&& modemCognitive == other.modemCognitive
		&& maxConns == other.maxConns
		&& waitTime == other.waitTime
		&& maxConnsTime == other.maxConnsTime
		&& mtu == other.mtu
		&& mvnoType.equals(other.mvnoType)
		&& mvnoMatchData.equals(other.mvnoMatchData);
		}

		/**
		* Check if neither mention DUN and are substantially similar
		*
		* @param other The other APN settings to compare
		* @return True if two APN settings are similar
		*/
		public boolean similar(ApnSetting other) {
		return (!this.canHandleType(PhoneConstants.APN_TYPE_DUN)
		&& !other.canHandleType(PhoneConstants.APN_TYPE_DUN)
		&& Objects.equals(this.apn, other.apn)
		&& !typeSameAny(this, other)
		&& xorEquals(this.proxy, other.proxy)
		&& xorEquals(this.port, other.port)
		&& xorEquals(this.protocol, other.protocol)
		&& xorEquals(this.roamingProtocol, other.roamingProtocol)
		&& this.carrierEnabled == other.carrierEnabled
		&& this.bearerBitmask == other.bearerBitmask
		&& this.profileId == other.profileId
		&& Objects.equals(this.mvnoType, other.mvnoType)
		&& Objects.equals(this.mvnoMatchData, other.mvnoMatchData)
		&& xorEquals(this.mmsc, other.mmsc)
		&& xorEquals(this.mmsProxy, other.mmsProxy)
		&& xorEquals(this.mmsPort, other.mmsPort));
		}

		// check whether the types of two APN same (even only one type of each APN is same)
		private boolean typeSameAny(ApnSetting first, ApnSetting second) {
		if (VDBG) {
		StringBuilder apnType1 = new StringBuilder(first.apn + ": ");
		for (int index1 = 0; index1 < first.types.length; index1++) {
		apnType1.append(first.types[index1]);
		apnType1.append(",");
		}

		StringBuilder apnType2 = new StringBuilder(second.apn + ": ");
		for (int index1 = 0; index1 < second.types.length; index1++) {
		apnType2.append(second.types[index1]);
		apnType2.append(",");
		}
		Rlog.d(LOG_TAG, "APN1: is " + apnType1);
		Rlog.d(LOG_TAG, "APN2: is " + apnType2);
		}

		for (int index1 = 0; index1 < first.types.length; index1++) {
		for (int index2 = 0; index2 < second.types.length; index2++) {
		if (first.types[index1].equals(PhoneConstants.APN_TYPE_ALL)
		\|\| second.types[index2].equals(PhoneConstants.APN_TYPE_ALL)
		\|\| first.types[index1].equals(second.types[index2])) {
		if (VDBG) Rlog.d(LOG_TAG, "typeSameAny: return true");
		return true;
		}
		}
		}

		if (VDBG) Rlog.d(LOG_TAG, "typeSameAny: return false");
		return false;
		}

		// equal or one is not specified
		private boolean xorEquals(String first, String second) {
		return (Objects.equals(first, second)
		\|\| TextUtils.isEmpty(first)
		\|\| TextUtils.isEmpty(second));
		}

		// Helper function to convert APN string into a 32-bit bitmask.
		private static int getApnBitmask(String apn) {
		switch (apn) {

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+22 −63

Original line number	Diff line number	Diff line
		@@ -101,7 +101,6 @@ import java.util.Arrays;
		import java.util.Comparator;
		import java.util.HashMap;
		import java.util.Map.Entry;
		import java.util.Objects;
		import java.util.PriorityQueue;
		import java.util.Set;
		import java.util.concurrent.ConcurrentHashMap;
		@@ -3381,7 +3380,7 @@ public class DcTracker extends Handler {
		int j = i + 1;
		while (j < mAllApnSettings.size()) {
		second = mAllApnSettings.get(j);
		if (apnsSimilar(first, second)) {
		if (first.similar(second)) {
		ApnSetting newApn = mergeApns(first, second);
		mAllApnSettings.set(i, newApn);
		first = newApn;
		@@ -3394,66 +3393,6 @@ public class DcTracker extends Handler {
		}
		}

		//check whether the types of two APN same (even only one type of each APN is same)
		private boolean apnTypeSameAny(ApnSetting first, ApnSetting second) {
		if(VDBG) {
		StringBuilder apnType1 = new StringBuilder(first.apn + ": ");
		for(int index1 = 0; index1 < first.types.length; index1++) {
		apnType1.append(first.types[index1]);
		apnType1.append(",");
		}

		StringBuilder apnType2 = new StringBuilder(second.apn + ": ");
		for(int index1 = 0; index1 < second.types.length; index1++) {
		apnType2.append(second.types[index1]);
		apnType2.append(",");
		}
		log("APN1: is " + apnType1);
		log("APN2: is " + apnType2);
		}

		for(int index1 = 0; index1 < first.types.length; index1++) {
		for(int index2 = 0; index2 < second.types.length; index2++) {
		if(first.types[index1].equals(PhoneConstants.APN_TYPE_ALL) \|\|
		second.types[index2].equals(PhoneConstants.APN_TYPE_ALL) \|\|
		first.types[index1].equals(second.types[index2])) {
		if(VDBG)log("apnTypeSameAny: return true");
		return true;
		}
		}
		}

		if(VDBG)log("apnTypeSameAny: return false");
		return false;
		}

		// Check if neither mention DUN and are substantially similar
		private boolean apnsSimilar(ApnSetting first, ApnSetting second) {
		return (!first.canHandleType(PhoneConstants.APN_TYPE_DUN)
		&& !second.canHandleType(PhoneConstants.APN_TYPE_DUN)
		&& Objects.equals(first.apn, second.apn)
		&& !apnTypeSameAny(first, second)
		&& xorEquals(first.proxy, second.proxy)
		&& xorEquals(first.port, second.port)
		&& xorEquals(first.protocol, second.protocol)
		&& xorEquals(first.roamingProtocol, second.roamingProtocol)
		&& first.carrierEnabled == second.carrierEnabled
		&& first.bearerBitmask == second.bearerBitmask
		&& first.profileId == second.profileId
		&& Objects.equals(first.mvnoType, second.mvnoType)
		&& Objects.equals(first.mvnoMatchData, second.mvnoMatchData)
		&& xorEquals(first.mmsc, second.mmsc)
		&& xorEquals(first.mmsProxy, second.mmsProxy)
		&& xorEquals(first.mmsPort, second.mmsPort));
		}

		// equal or one is not specified
		private boolean xorEquals(String first, String second) {
		return (Objects.equals(first, second) \|\|
		TextUtils.isEmpty(first) \|\|
		TextUtils.isEmpty(second));
		}

		private ApnSetting mergeApns(ApnSetting dest, ApnSetting src) {
		int id = dest.id;
		ArrayList<String> resultTypes = new ArrayList<String>();
		@@ -4384,6 +4323,23 @@ public class DcTracker extends Handler {
		}
		}

		private boolean containsAllApns(ArrayList<ApnSetting> oldApnList,
		ArrayList<ApnSetting> newApnList) {
		for (ApnSetting newApnSetting : newApnList) {
		boolean canHandle = false;
		for (ApnSetting oldApnSetting : oldApnList) {
		// Make sure at least one of the APN from old list can cover the new APN
		if (oldApnSetting.equals(newApnSetting,
		mPhone.getServiceState().getDataRoamingFromRegistration())) {
		canHandle = true;
		break;
		}
		}
		if (!canHandle) return false;
		}
		return true;
		}

		private void cleanUpConnectionsOnUpdatedApns(boolean tearDown, String reason) {
		if (DBG) log("cleanUpConnectionsOnUpdatedApns: tearDown=" + tearDown);
		if (mAllApnSettings != null && mAllApnSettings.isEmpty()) {
		@@ -4403,7 +4359,10 @@ public class DcTracker extends Handler {
		if (VDBG) log("new waitingApns:" + waitingApns);
		if ((currentWaitingApns != null)
		&& ((waitingApns.size() != currentWaitingApns.size())
		\|\| (!currentWaitingApns.containsAll(waitingApns)))) {
		// Check if the existing waiting APN list can cover the newly built APN
		// list. If yes, then we don't need to tear down the existing data call.
		// TODO: We probably need to rebuild APN list when roaming status changes.
		\|\| !containsAllApns(currentWaitingApns, waitingApns))) {
		if (VDBG) log("new waiting apn is different for " + apnContext);
		apnContext.setWaitingApns(waitingApns);
		if (!apnContext.isDisconnected()) {

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

+31 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@ package com.android.internal.telephony;
		import static com.android.internal.telephony.TelephonyTestUtils.waitForMs;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertTrue;
		import static org.mockito.ArgumentMatchers.isNull;
		import static org.mockito.Mockito.any;
		import static org.mockito.Mockito.anyBoolean;
		@@ -503,7 +505,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest {
		when(mSubscriptionController.getSubscriptionInfoListForEmbeddedSubscriptionUpdate(
		new String[] { "1", "3"}, false /* removable */)).thenReturn(subInfoList);

		mUpdater.updateEmbeddedSubscriptions();
		assertTrue(mUpdater.updateEmbeddedSubscriptions());

		// 3 is new and so a new entry should have been created.
		verify(mSubscriptionController).insertEmptySubInfoRecord(
		@@ -554,7 +556,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest {
		when(mSubscriptionController.getSubscriptionInfoListForEmbeddedSubscriptionUpdate(
		new String[0], false /* removable */)).thenReturn(subInfoList);

		mUpdater.updateEmbeddedSubscriptions();
		assertTrue(mUpdater.updateEmbeddedSubscriptions());

		// No new entries should be created.
		verify(mSubscriptionController, times(0)).clearSubInfo();
		@@ -574,4 +576,31 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest {
		assertEquals(0,
		iccid2Values.getValue().getAsInteger(SubscriptionManager.IS_EMBEDDED).intValue());
		}

		@Test
		@SmallTest
		public void testUpdateEmbeddedSubscriptions_emptyToEmpty() throws Exception {
		when(mEuiccManager.isEnabled()).thenReturn(true);
		when(mEuiccController.blockingGetEuiccProfileInfoList())
		.thenReturn(new GetEuiccProfileInfoListResult(
		42, null /* subscriptions /, true / removable */));

		List<SubscriptionInfo> subInfoList = new ArrayList<>();
		// 1: not embedded.
		subInfoList.add(new SubscriptionInfo(
		0, "1", 0, "", "", 0, 0, "", 0, null, 0, 0, "", false /* isEmbedded */,
		null /* accessRules */));

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

		assertFalse(mUpdater.updateEmbeddedSubscriptions());

		// No new entries should be created.
		verify(mSubscriptionController, never()).insertEmptySubInfoRecord(anyString(), anyInt());

		// No existing entries should have been updated.
		verify(mContentProvider, never()).update(eq(SubscriptionManager.CONTENT_URI), any(),
		any(), isNull());
		}
		}
		No newline at end of file