Merge "Disable CDMA calls" into main (68e3d4be) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -775,6 +775,7 @@ public class GsmCdmaPhone extends Phone {
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		@Override
		public int getPhoneType() {
		if (mFeatureFlags.cleanupCdma()) return PhoneConstants.PHONE_TYPE_GSM;
		if (mPrecisePhoneType == PhoneConstants.PHONE_TYPE_GSM) {
		return PhoneConstants.PHONE_TYPE_GSM;
		} else {

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

+22 −2

Original line number	Diff line number	Diff line
		@@ -2284,6 +2284,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param response is callback message to report one of TelephonyManager#CDMA_ROAMING_MODE_*
		*/
		public void queryCdmaRoamingPreference(Message response) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.queryCdmaRoamingPreference(response);
		}

		@@ -2293,6 +2294,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param response is callback message to report one of TelephonyManager#CDMA_SUBSCRIPTION_*
		*/
		public void queryCdmaSubscriptionMode(Message response) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.getCdmaSubscriptionSource(response);
		}

		@@ -2330,6 +2332,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param response is callback message
		*/
		public void setCdmaRoamingPreference(int cdmaRoamingType, Message response) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.setCdmaRoamingPreference(cdmaRoamingType, response);
		}

		@@ -2339,6 +2342,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param response is callback message
		*/
		public void setCdmaSubscriptionMode(int cdmaSubscriptionType, Message response) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.setCdmaSubscriptionSource(cdmaSubscriptionType, response);
		}

		@@ -2775,6 +2779,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param workSource calling WorkSource
		*/
		public void nvReadItem(int itemID, Message response, WorkSource workSource) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.nvReadItem(itemID, response, workSource);
		}

		@@ -2789,6 +2794,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		*/
		public void nvWriteItem(int itemID, String itemValue, Message response,
		WorkSource workSource) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.nvWriteItem(itemID, itemValue, response, workSource);
		}

		@@ -2800,6 +2806,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param response Callback message.
		*/
		public void nvWriteCdmaPrl(byte[] preferredRoamingList, Message response) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.nvWriteCdmaPrl(preferredRoamingList, response);
		}

		@@ -3513,6 +3520,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param obj User object.
		*/
		public void registerForNumberInfo(Handler h, int what, Object obj) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.registerForNumberInfo(h, what, obj);
		}

		@@ -3523,6 +3531,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param h Handler to be removed from the registrant list.
		*/
		public void unregisterForNumberInfo(Handler h) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.unregisterForNumberInfo(h);
		}

		@@ -3538,6 +3547,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param obj User object.
		*/
		public void registerForRedirectedNumberInfo(Handler h, int what, Object obj) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.registerForRedirectedNumberInfo(h, what, obj);
		}

		@@ -3548,6 +3558,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param h Handler to be removed from the registrant list.
		*/
		public void unregisterForRedirectedNumberInfo(Handler h) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.unregisterForRedirectedNumberInfo(h);
		}

		@@ -3563,6 +3574,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param obj User object.
		*/
		public void registerForLineControlInfo(Handler h, int what, Object obj) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.registerForLineControlInfo(h, what, obj);
		}

		@@ -3573,6 +3585,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param h Handler to be removed from the registrant list.
		*/
		public void unregisterForLineControlInfo(Handler h) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.unregisterForLineControlInfo(h);
		}

		@@ -3588,6 +3601,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param obj User object.
		*/
		public void registerFoT53ClirlInfo(Handler h, int what, Object obj) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.registerFoT53ClirlInfo(h, what, obj);
		}

		@@ -3598,6 +3612,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param h Handler to be removed from the registrant list.
		*/
		public void unregisterForT53ClirInfo(Handler h) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.unregisterForT53ClirInfo(h);
		}

		@@ -3613,6 +3628,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param obj User object.
		*/
		public void registerForT53AudioControlInfo(Handler h, int what, Object obj) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.registerForT53AudioControlInfo(h, what, obj);
		}

		@@ -3623,6 +3639,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		* @param h Handler to be removed from the registrant list.
		*/
		public void unregisterForT53AudioControlInfo(Handler h) {
		if (mFeatureFlags.cleanupCdma()) return;
		mCi.unregisterForT53AudioControlInfo(h);
		}

		@@ -4161,8 +4178,11 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {

		setRoamingOverrideHelper(gsmRoamingList, GSM_ROAMING_LIST_OVERRIDE_PREFIX, iccId);
		setRoamingOverrideHelper(gsmNonRoamingList, GSM_NON_ROAMING_LIST_OVERRIDE_PREFIX, iccId);
		if (!mFeatureFlags.cleanupCdma()) {
		setRoamingOverrideHelper(cdmaRoamingList, CDMA_ROAMING_LIST_OVERRIDE_PREFIX, iccId);
		setRoamingOverrideHelper(cdmaNonRoamingList, CDMA_NON_ROAMING_LIST_OVERRIDE_PREFIX, iccId);
		setRoamingOverrideHelper(cdmaNonRoamingList, CDMA_NON_ROAMING_LIST_OVERRIDE_PREFIX,
		iccId);
		}

		// Refresh.
		ServiceStateTracker tracker = getServiceStateTracker();

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

+39 −0

Original line number	Diff line number	Diff line
		@@ -1125,6 +1125,9 @@ public class RIL extends BaseCommands implements CommandsInterface {
		SparseArray<RadioServiceProxy> proxies, @NonNull FeatureFlags flags) {
		super(context);
		mFeatureFlags = flags;
		if (mFeatureFlags.cleanupCdma()) {
		cdmaSubscription = TelephonyManager.CDMA_SUBSCRIPTION_UNKNOWN;
		}
		if (RILJ_LOGD) {
		riljLog("RIL: init allowedNetworkTypes=" + allowedNetworkTypes
		+ " cdmaSubscription=" + cdmaSubscription + ")");
		@@ -3218,6 +3221,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void setCdmaSubscriptionSource(int cdmaSubscription, Message result) {
		if (mFeatureFlags.cleanupCdma()) return;

		RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
		if (!canMakeRequest("setCdmaSubscriptionSource", simProxy, result, RADIO_HAL_VERSION_1_4)) {
		return;
		@@ -3238,6 +3243,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void queryCdmaRoamingPreference(Message result) {
		if (mFeatureFlags.cleanupCdma()) return;

		RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
		if (!canMakeRequest("queryCdmaRoamingPreference", networkProxy, result,
		RADIO_HAL_VERSION_1_4)) {
		@@ -3258,6 +3265,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void setCdmaRoamingPreference(int cdmaRoamingType, Message result) {
		if (mFeatureFlags.cleanupCdma()) return;

		RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class);
		if (!canMakeRequest("setCdmaRoamingPreference", networkProxy, result,
		RADIO_HAL_VERSION_1_4)) {
		@@ -3357,6 +3366,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void sendCDMAFeatureCode(String featureCode, Message result) {
		if (mFeatureFlags.cleanupCdma()) return;

		RadioVoiceProxy voiceProxy = getRadioServiceProxy(RadioVoiceProxy.class);
		if (!canMakeRequest("sendCDMAFeatureCode", voiceProxy, result, RADIO_HAL_VERSION_1_4)) {
		return;
		@@ -3397,6 +3408,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void sendCdmaSMSExpectMore(byte[] pdu, Message result) {
		if (mFeatureFlags.cleanupCdma()) return;

		RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
		if (!canMakeRequest("sendCdmaSMSExpectMore", messagingProxy, result,
		RADIO_HAL_VERSION_1_4)) {
		@@ -3423,6 +3436,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void sendCdmaSms(byte[] pdu, Message result) {
		if (mFeatureFlags.cleanupCdma()) return;

		RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
		if (!canMakeRequest("sendCdmaSms", messagingProxy, result, RADIO_HAL_VERSION_1_4)) {
		return;
		@@ -3444,6 +3459,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void acknowledgeLastIncomingCdmaSms(boolean success, int cause, Message result) {
		if (mFeatureFlags.cleanupCdma()) return;

		RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
		if (!canMakeRequest("acknowledgeLastIncomingCdmaSms", messagingProxy, result,
		RADIO_HAL_VERSION_1_4)) {
		@@ -3531,6 +3548,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void getCdmaBroadcastConfig(Message result) {
		if (mFeatureFlags.cleanupCdma()) return;

		RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
		if (!canMakeRequest("getCdmaBroadcastConfig", messagingProxy, result,
		RADIO_HAL_VERSION_1_4)) {
		@@ -3551,6 +3570,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void setCdmaBroadcastConfig(CdmaSmsBroadcastConfigInfo[] configs, Message result) {
		if (mFeatureFlags.cleanupCdma()) return;

		RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
		if (!canMakeRequest("setCdmaBroadcastConfig", messagingProxy, result,
		RADIO_HAL_VERSION_1_4)) {
		@@ -3575,6 +3596,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void setCdmaBroadcastActivation(boolean activate, Message result) {
		if (mFeatureFlags.cleanupCdma()) return;

		RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
		if (!canMakeRequest("setCdmaBroadcastActivation", messagingProxy, result,
		RADIO_HAL_VERSION_1_4)) {
		@@ -3596,6 +3619,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void getCDMASubscription(Message result) {
		if (mFeatureFlags.cleanupCdma()) return;

		RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
		if (!canMakeRequest("getCDMASubscription", simProxy, result, RADIO_HAL_VERSION_1_4)) {
		return;
		@@ -3634,6 +3659,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void deleteSmsOnRuim(int index, Message result) {
		if (mFeatureFlags.cleanupCdma()) return;

		RadioMessagingProxy messagingProxy = getRadioServiceProxy(RadioMessagingProxy.class);
		if (!canMakeRequest("deleteSmsOnRuim", messagingProxy, result, RADIO_HAL_VERSION_1_4)) {
		return;
		@@ -3787,6 +3814,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void getCdmaSubscriptionSource(Message result) {
		if (mFeatureFlags.cleanupCdma()) return;

		RadioSimProxy simProxy = getRadioServiceProxy(RadioSimProxy.class);
		if (!canMakeRequest("getCdmaSubscriptionSource", simProxy, result, RADIO_HAL_VERSION_1_4)) {
		return;
		@@ -4074,6 +4103,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void nvReadItem(int itemID, Message result, WorkSource workSource) {
		if (mFeatureFlags.cleanupCdma()) return;

		RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
		if (!canMakeRequest("nvReadItem", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
		return;
		@@ -4094,6 +4125,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void nvWriteItem(int itemId, String itemValue, Message result, WorkSource workSource) {
		if (mFeatureFlags.cleanupCdma()) return;

		RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
		if (!canMakeRequest("nvWriteItem", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
		return;
		@@ -4115,6 +4148,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void nvWriteCdmaPrl(byte[] preferredRoamingList, Message result) {
		if (mFeatureFlags.cleanupCdma()) return;

		RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
		if (!canMakeRequest("nvWriteCdmaPrl", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
		return;
		@@ -4135,6 +4170,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@Override
		public void nvResetConfig(int resetType, Message result) {
		if (mFeatureFlags.cleanupCdma()) return;

		RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class);
		if (!canMakeRequest("nvResetConfig", modemProxy, result, RADIO_HAL_VERSION_1_4)) {
		return;
		@@ -6118,6 +6155,8 @@ public class RIL extends BaseCommands implements CommandsInterface {

		@UnsupportedAppUsage
		void notifyRegistrantsCdmaInfoRec(CdmaInformationRecords infoRec) {
		if (mFeatureFlags.cleanupCdma()) return;

		int response = RIL_UNSOL_CDMA_INFO_REC;
		if (infoRec.record instanceof CdmaInformationRecords.CdmaDisplayInfoRec) {
		if (mDisplayInfoRegistrants != null) {

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -4247,7 +4247,8 @@ public class RILUtils {
		iccCardStatus.setCardState(cardStatus10.cardState);
		iccCardStatus.setUniversalPinState(cardStatus10.universalPinState);
		iccCardStatus.mGsmUmtsSubscriptionAppIndex = cardStatus10.gsmUmtsSubscriptionAppIndex;
		iccCardStatus.mCdmaSubscriptionAppIndex = cardStatus10.cdmaSubscriptionAppIndex;
		iccCardStatus.mCdmaSubscriptionAppIndex =
		Flags.cleanupCdma() ? -1 : cardStatus10.cdmaSubscriptionAppIndex;
		iccCardStatus.mImsSubscriptionAppIndex = cardStatus10.imsSubscriptionAppIndex;
		int numApplications = cardStatus10.applications.size();

		@@ -4317,7 +4318,8 @@ public class RILUtils {
		iccCardStatus.setMultipleEnabledProfilesMode(cardStatus.supportedMepMode);
		iccCardStatus.setUniversalPinState(cardStatus.universalPinState);
		iccCardStatus.mGsmUmtsSubscriptionAppIndex = cardStatus.gsmUmtsSubscriptionAppIndex;
		iccCardStatus.mCdmaSubscriptionAppIndex = cardStatus.cdmaSubscriptionAppIndex;
		iccCardStatus.mCdmaSubscriptionAppIndex =
		Flags.cleanupCdma() ? -1 : cardStatus.cdmaSubscriptionAppIndex;
		iccCardStatus.mImsSubscriptionAppIndex = cardStatus.imsSubscriptionAppIndex;
		iccCardStatus.atr = cardStatus.atr;
		iccCardStatus.iccid = cardStatus.iccid;

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.os.RemoteException;
		import android.telephony.Rlog;

		import com.android.internal.telephony.cdma.CdmaSmsBroadcastConfigInfo;
		import com.android.internal.telephony.flags.Flags;
		import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo;

		import java.util.ArrayList;
		@@ -107,6 +108,7 @@ public class RadioMessagingProxy extends RadioServiceProxy {
		*/
		public void acknowledgeLastIncomingCdmaSms(int serial, boolean success, int cause)
		throws RemoteException {
		if (Flags.cleanupCdma()) return;
		if (isEmpty()) return;
		if (isAidl()) {
		android.hardware.radio.messaging.CdmaSmsAck msg =
		@@ -147,6 +149,7 @@ public class RadioMessagingProxy extends RadioServiceProxy {
		* @throws RemoteException
		*/
		public void deleteSmsOnRuim(int serial, int index) throws RemoteException {
		if (Flags.cleanupCdma()) return;
		if (isEmpty()) return;
		if (isAidl()) {
		mMessagingProxy.deleteSmsOnRuim(serial, index);
		@@ -176,6 +179,7 @@ public class RadioMessagingProxy extends RadioServiceProxy {
		* @throws RemoteException
		*/
		public void getCdmaBroadcastConfig(int serial) throws RemoteException {
		if (Flags.cleanupCdma()) return;
		if (isEmpty()) return;
		if (isAidl()) {
		mMessagingProxy.getCdmaBroadcastConfig(serial);
		@@ -248,6 +252,7 @@ public class RadioMessagingProxy extends RadioServiceProxy {
		* @throws RemoteException
		*/
		public void sendCdmaSms(int serial, byte[] pdu) throws RemoteException {
		if (Flags.cleanupCdma()) return;
		if (isEmpty()) return;
		if (isAidl()) {
		mMessagingProxy.sendCdmaSms(serial, RILUtils.convertToHalCdmaSmsMessageAidl(pdu));
		@@ -266,6 +271,7 @@ public class RadioMessagingProxy extends RadioServiceProxy {
		* @throws RemoteException
		*/
		public void sendCdmaSmsExpectMore(int serial, byte[] pdu) throws RemoteException {
		if (Flags.cleanupCdma()) return;
		if (isEmpty()) return;
		if (isAidl()) {
		mMessagingProxy.sendCdmaSmsExpectMore(
		@@ -378,6 +384,7 @@ public class RadioMessagingProxy extends RadioServiceProxy {
		* @throws RemoteException
		*/
		public void setCdmaBroadcastActivation(int serial, boolean activate) throws RemoteException {
		if (Flags.cleanupCdma()) return;
		if (isEmpty()) return;
		if (isAidl()) {
		mMessagingProxy.setCdmaBroadcastActivation(serial, activate);
		@@ -394,6 +401,7 @@ public class RadioMessagingProxy extends RadioServiceProxy {
		*/
		public void setCdmaBroadcastConfig(int serial, CdmaSmsBroadcastConfigInfo[] configs)
		throws RemoteException {
		if (Flags.cleanupCdma()) return;
		if (isEmpty()) return;
		if (isAidl()) {
		ArrayList<android.hardware.radio.messaging.CdmaBroadcastSmsConfigInfo> halConfigs =
		@@ -513,6 +521,7 @@ public class RadioMessagingProxy extends RadioServiceProxy {
		* @throws RemoteException
		*/
		public void writeSmsToRuim(int serial, int status, byte[] pdu) throws RemoteException {
		if (Flags.cleanupCdma()) return;
		if (isEmpty()) return;
		if (isAidl()) {
		android.hardware.radio.messaging.CdmaSmsWriteArgs args =