Add TDSCDMA family (dd8efa82) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/RadioAccessFamily.java

+60 −0

Original line number	Diff line number	Diff line
		@@ -185,6 +185,36 @@ public class RadioAccessFamily implements Parcelable {
		case RILConstants.NETWORK_MODE_GLOBAL:
		raf = GSM \| WCDMA \| CDMA \| EVDO;
		break;
		case RILConstants.NETWORK_MODE_TDSCDMA_ONLY:
		raf = RAF_TD_SCDMA;
		break;
		case RILConstants.NETWORK_MODE_TDSCDMA_WCDMA:
		raf = RAF_TD_SCDMA \| WCDMA;
		break;
		case RILConstants.NETWORK_MODE_LTE_TDSCDMA:
		raf = RAF_LTE \| RAF_TD_SCDMA;
		break;
		case RILConstants.NETWORK_MODE_TDSCDMA_GSM:
		raf = RAF_TD_SCDMA \| GSM;
		break;
		case RILConstants.NETWORK_MODE_LTE_TDSCDMA_GSM:
		raf = RAF_LTE \| RAF_TD_SCDMA \| GSM;
		break;
		case RILConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA:
		raf = RAF_TD_SCDMA \| GSM \| WCDMA;
		break;
		case RILConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA:
		raf = RAF_LTE \| RAF_TD_SCDMA \| WCDMA;
		break;
		case RILConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
		raf = RAF_LTE \| RAF_TD_SCDMA \| GSM \| WCDMA;
		break;
		case RILConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
		raf = RAF_TD_SCDMA \| CDMA \| EVDO \| GSM \| WCDMA;
		break;
		case RILConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
		raf = RAF_LTE \| RAF_TD_SCDMA \| CDMA \| EVDO \| GSM \| WCDMA;
		break;
		default:
		raf = RAF_UNKNOWN;
		break;
		@@ -248,6 +278,36 @@ public class RadioAccessFamily implements Parcelable {
		case (GSM \| WCDMA \| CDMA \| EVDO):
		type = RILConstants.NETWORK_MODE_GLOBAL;
		break;
		case RAF_TD_SCDMA:
		type = RILConstants.NETWORK_MODE_TDSCDMA_ONLY;
		break;
		case (RAF_TD_SCDMA \| WCDMA):
		type = RILConstants.NETWORK_MODE_TDSCDMA_WCDMA;
		break;
		case (RAF_LTE \| RAF_TD_SCDMA):
		type = RILConstants.NETWORK_MODE_LTE_TDSCDMA;
		break;
		case (RAF_TD_SCDMA \| GSM):
		type = RILConstants.NETWORK_MODE_TDSCDMA_GSM;
		break;
		case (RAF_LTE \| RAF_TD_SCDMA \| GSM):
		type = RILConstants.NETWORK_MODE_LTE_TDSCDMA_GSM;
		break;
		case (RAF_TD_SCDMA \| GSM \| WCDMA):
		type = RILConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA;
		break;
		case (RAF_LTE \| RAF_TD_SCDMA \| WCDMA):
		type = RILConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA;
		break;
		case (RAF_LTE \| RAF_TD_SCDMA \| GSM \| WCDMA):
		type = RILConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA;
		break;
		case (RAF_TD_SCDMA \| CDMA \| EVDO \| GSM \| WCDMA):
		type = RILConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
		break;
		case (RAF_LTE \| RAF_TD_SCDMA \| RAF_LTE \| CDMA \| EVDO \| GSM \| WCDMA):
		type = RILConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
		break;
		default:
		type = RILConstants.PREFERRED_NETWORK_MODE ;
		break;

telephony/java/android/telephony/TelephonyManager.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -1059,11 +1059,21 @@ public class TelephonyManager {
		case RILConstants.NETWORK_MODE_LTE_GSM_WCDMA:
		case RILConstants.NETWORK_MODE_LTE_WCDMA:
		case RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
		case RILConstants.NETWORK_MODE_TDSCDMA_ONLY:
		case RILConstants.NETWORK_MODE_TDSCDMA_WCDMA:
		case RILConstants.NETWORK_MODE_LTE_TDSCDMA:
		case RILConstants.NETWORK_MODE_TDSCDMA_GSM:
		case RILConstants.NETWORK_MODE_LTE_TDSCDMA_GSM:
		case RILConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA:
		case RILConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA:
		case RILConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
		case RILConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
		return PhoneConstants.PHONE_TYPE_GSM;

		// Use CDMA Phone for the global mode including CDMA
		case RILConstants.NETWORK_MODE_GLOBAL:
		case RILConstants.NETWORK_MODE_LTE_CDMA_EVDO:
		case RILConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
		return PhoneConstants.PHONE_TYPE_CDMA;

		case RILConstants.NETWORK_MODE_LTE_ONLY:

telephony/java/com/android/internal/telephony/RILConstants.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,16 @@ public interface RILConstants {
		int NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA = 10; /* LTE, CDMA, EvDo, GSM/WCDMA */
		int NETWORK_MODE_LTE_ONLY = 11; /* LTE Only mode. */
		int NETWORK_MODE_LTE_WCDMA = 12; /* LTE/WCDMA */
		int NETWORK_MODE_TDSCDMA_ONLY = 13; /* TD-SCDMA only */
		int NETWORK_MODE_TDSCDMA_WCDMA = 14; /* TD-SCDMA and WCDMA */
		int NETWORK_MODE_LTE_TDSCDMA = 15; /* TD-SCDMA and LTE */
		int NETWORK_MODE_TDSCDMA_GSM = 16; /* TD-SCDMA and GSM */
		int NETWORK_MODE_LTE_TDSCDMA_GSM = 17; /* TD-SCDMA,GSM and LTE */
		int NETWORK_MODE_TDSCDMA_GSM_WCDMA = 18; /* TD-SCDMA, GSM/WCDMA */
		int NETWORK_MODE_LTE_TDSCDMA_WCDMA = 19; /* TD-SCDMA, WCDMA and LTE */
		int NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA = 20; /* TD-SCDMA, GSM/WCDMA and LTE */
		int NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 21; /TD-SCDMA,EvDo,CDMA,GSM/WCDMA/
		int NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = 22; /* TD-SCDMA/LTE/GSM/WCDMA, CDMA, and EvDo */
		int PREFERRED_NETWORK_MODE = SystemProperties.getInt("ro.telephony.default_network",
		NETWORK_MODE_WCDMA_PREF);