Snap for 7691524 from 36047d1181a3f09df5f51059c4e79ab4b18248d4 to sc-v2-release (29df3429) · Commits · e / os / android_frameworks_opt_telephony

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

+12 −7

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ import com.android.internal.telephony.uicc.UiccCardApplication;
		import com.android.telephony.Rlog;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;

		/**
		* {@hide}
		@@ -141,7 +141,10 @@ public class GsmCdmaConnection extends Connection {
		mAddress = dc.number;
		setEmergencyCallInfo(mOwner);

		mForwardedNumber = new ArrayList<String>(Arrays.asList(dc.forwardedNumber));
		String forwardedNumber = TextUtils.isEmpty(dc.forwardedNumber) ? null : dc.forwardedNumber;
		Rlog.i(LOG_TAG, "create, forwardedNumber=" + Rlog.pii(LOG_TAG, forwardedNumber));
		mForwardedNumber = forwardedNumber == null ? null :
		new ArrayList<>(Collections.singletonList(dc.forwardedNumber));
		mIsIncoming = dc.isMT;
		mCreateTime = System.currentTimeMillis();
		mCnapName = dc.name;
		@@ -710,11 +713,13 @@ public class GsmCdmaConnection extends Connection {
		mOwner.getPhone().getVoiceCallSessionStats().onAudioCodecChanged(this, dc.audioQuality);
		}

		ArrayList<String> forwardedNumber =
		new ArrayList<String>(Arrays.asList(dc.forwardedNumber));
		if (!equalsHandlesNulls(mForwardedNumber, forwardedNumber)) {
		if (Phone.DEBUG_PHONE) log("update: mForwardedNumber, # changed!");
		mForwardedNumber = forwardedNumber;
		String forwardedNumber = TextUtils.isEmpty(dc.forwardedNumber) ? null : dc.forwardedNumber;
		Rlog.i(LOG_TAG, "update: forwardedNumber=" + Rlog.pii(LOG_TAG, forwardedNumber));
		ArrayList<String> forwardedNumbers = forwardedNumber == null ? null :
		new ArrayList<>(Collections.singletonList(dc.forwardedNumber));
		if (!equalsHandlesNulls(mForwardedNumber, forwardedNumbers)) {
		if (Phone.DEBUG_PHONE) log("update: mForwardedNumber, # changed");
		mForwardedNumber = forwardedNumbers;
		changed = true;
		}

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -2805,10 +2805,6 @@ public class GsmCdmaPhone extends Phone {
		if (!isPhoneTypeGsm()) {
		mCdmaSubscriptionSource = mCdmaSSM.getCdmaSubscriptionSource();
		}

		// If this is on APM off, SIM may already be loaded. Send setPreferredNetworkType
		// request to RIL to preserve user setting across APM toggling
		setPreferredNetworkTypeIfSimLoaded();
		}

		private void handleRadioOffOrNotAvailable() {

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -4397,13 +4397,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		}
		}

		protected void setPreferredNetworkTypeIfSimLoaded() {
		int subId = getSubId();
		if (SubscriptionManager.isValidSubscriptionId(subId)) {
		updateAllowedNetworkTypes(null);
		}
		}

		/**
		* Registers the handler when phone radio capability is changed.
		*

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -37,9 +37,7 @@ import android.telephony.AnomalyReporter;
		import android.telephony.NetworkRegistrationInfo;
		import android.telephony.ServiceState;
		import android.telephony.TelephonyManager;
		import android.telephony.data.NrQosSessionAttributes;
		import android.telephony.data.QosBearerSession;
		import android.util.ArrayMap;
		import android.util.LocalLog;
		import android.util.SparseArray;

		@@ -59,6 +57,7 @@ import java.util.List;
		import java.util.Map;
		import java.util.Objects;
		import java.util.UUID;
		import java.util.concurrent.ConcurrentHashMap;
		import java.util.concurrent.Executor;
		import java.util.concurrent.Executors;
		import java.util.concurrent.TimeUnit;
		@@ -95,7 +94,7 @@ public class DcNetworkAgent extends NetworkAgent {
		private final LocalLog mNetCapsLocalLog = new LocalLog(50);

		// For interface duplicate detection. Key is the net id, value is the interface name in string.
		private static Map<Integer, String> sInterfaceNames = new ArrayMap<>();
		private static Map<Integer, String> sInterfaceNames = new ConcurrentHashMap<>();

		private static final long NETWORK_UNWANTED_ANOMALY_WINDOW_MS = TimeUnit.MINUTES.toMillis(5);
		private static final int NETWORK_UNWANTED_ANOMALY_NUM_OCCURRENCES = 12;

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

+18 −0

Original line number	Diff line number	Diff line
		@@ -278,4 +278,22 @@ public class GsmCdmaConnectionTest extends TelephonyTest {
		assertEquals(new ArrayList<String>(Arrays.asList(forwardedNumber)),
		connection.getForwardedNumber());
		}

		@Test @SmallTest
		public void testForwardedNumberEmptyNull() {
		mDC.state = DriverCall.State.INCOMING;
		mDC.forwardedNumber = "";
		connection = new GsmCdmaConnection(mPhone, mDC, mCT, 0);
		assertNull(connection.getForwardedNumber());
		mDC.forwardedNumber = null;
		connection.update(mDC);
		assertNull(connection.getForwardedNumber());

		mDC.forwardedNumber = null;
		connection = new GsmCdmaConnection(mPhone, mDC, mCT, 0);
		assertNull(connection.getForwardedNumber());
		mDC.forwardedNumber = "";
		connection.update(mDC);
		assertNull(connection.getForwardedNumber());
		}
		}