Snap for 12763142 from 84f7a57a3952d8eac49a9f3e825f823acabe6a8b to 25Q1-release (4966968d) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

flags/calling.aconfig

+11 −0

Original line number	Diff line number	Diff line
		@@ -71,3 +71,14 @@ flag {
		bug:"359064059"
		is_exported: true
		}

		# OWNER=sewookseo TARGET=25Q2
		flag {
		name: "pass_copied_call_state_list"
		namespace: "telephony"
		description: "To prevent passing the TelephonyRegistry's original instance to listeners in the same process"
		bug:"379126049"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}
		No newline at end of file

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -2821,6 +2821,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param response Callback message.
		*/
		public void resetModemConfig(Message response) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.nvResetConfig(3 /* factory NV reset */, response);
		}

		@@ -2830,6 +2831,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param response Callback message.
		*/
		public void eraseModemConfig(Message response) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.nvResetConfig(2 /* erase NV */, response);
		}

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -387,6 +387,7 @@ import com.android.internal.telephony.cdma.sms.CdmaSmsSubaddress;
		import com.android.internal.telephony.cdma.sms.SmsEnvelope;
		import com.android.internal.telephony.data.KeepaliveStatus;
		import com.android.internal.telephony.data.KeepaliveStatus.KeepaliveStatusCode;
		import com.android.internal.telephony.flags.Flags;
		import com.android.internal.telephony.imsphone.ImsCallInfo;
		import com.android.internal.telephony.uicc.AdnCapacity;
		import com.android.internal.telephony.uicc.IccCardApplicationStatus;
		@@ -1173,6 +1174,10 @@ public class RILUtils {
		* 2 - erase NV reset (SCRTN)
		* 3 - factory reset (RTN)
		*/
		if (Flags.cleanupCdma()) {
		if (resetType == 1) return android.hardware.radio.V1_0.ResetNvType.RELOAD;
		return -1;
		}
		switch (resetType) {
		case 1: return android.hardware.radio.V1_0.ResetNvType.RELOAD;
		case 2: return android.hardware.radio.V1_0.ResetNvType.ERASE;
		@@ -1193,6 +1198,10 @@ public class RILUtils {
		* 2 - erase NV reset (SCRTN)
		* 3 - factory reset (RTN)
		*/
		if (Flags.cleanupCdma()) {
		if (resetType == 1) return android.hardware.radio.modem.ResetNvType.RELOAD;
		return -1;
		}
		switch (resetType) {
		case 1: return android.hardware.radio.modem.ResetNvType.RELOAD;
		case 2: return android.hardware.radio.modem.ResetNvType.ERASE;
		@@ -1689,6 +1698,9 @@ public class RILUtils {
		if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_NR) != 0) {
		raf \|= android.hardware.radio.RadioAccessFamily.NR;
		}
		if ((networkTypeBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_NB_IOT_NTN) != 0) {
		raf \|= android.hardware.radio.RadioAccessFamily.NB_IOT_NTN;
		}
		return (raf == 0) ? android.hardware.radio.RadioAccessFamily.UNKNOWN : raf;
		}

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

+10 −2

Original line number	Diff line number	Diff line
		@@ -281,7 +281,11 @@ public class RadioConfigProxy {
		}

		public void linkToDeath(long cookie) throws RemoteException {
		if (mService != null) {
		mService.linkToDeath(this, cookie);
		} else {
		Rlog.w(TAG, "linkToDeath: skipping since mService is null");
		}
		}

		public void clear() {
		@@ -316,7 +320,11 @@ public class RadioConfigProxy {
		}

		public void linkToDeath(int cookie) throws RemoteException {
		if (mService != null) {
		mService.linkToDeath(this, cookie);
		} else {
		Rlog.w(TAG, "linkToDeath: skipping since mService is null");
		}
		}

		public void clear() {

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -173,6 +173,7 @@ public class ServiceStateTest extends TestCase {
		rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_TD_SCDMA, false));
		rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN, false));
		rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_NR, false));
		rats.add(new Pair<Integer, Boolean>(ServiceState.RIL_RADIO_TECHNOLOGY_NB_IOT_NTN, false));

		for (Pair<Integer, Boolean> rat : rats) {
		boolean isCdma = rat.second;