diff options
6 files changed, 14 insertions, 8 deletions
diff --git a/telephony/java/com/android/internal/telephony/CommandsInterface.java b/telephony/java/com/android/internal/telephony/CommandsInterface.java index ea38543e7e38..9e1e0c66ed6a 100644 --- a/telephony/java/com/android/internal/telephony/CommandsInterface.java +++ b/telephony/java/com/android/internal/telephony/CommandsInterface.java @@ -27,9 +27,8 @@ import android.os.SystemProperties; * {@hide} */ public interface CommandsInterface { - // TODO: Get rid of mot from property. static final boolean LTE_AVAILABLE_ON_CDMA = - SystemProperties.getBoolean("ro.mot.lte_on_cdma", false); + SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA, false); enum RadioState { RADIO_OFF(0), /* Radio explictly powered off (eg CFUN=0) */ RADIO_UNAVAILABLE(0), /* Radio unavailable (eg, resetting or not booted) */ diff --git a/telephony/java/com/android/internal/telephony/IccCard.java b/telephony/java/com/android/internal/telephony/IccCard.java index d9c2e9a15209..dbfc0d415402 100644 --- a/telephony/java/com/android/internal/telephony/IccCard.java +++ b/telephony/java/com/android/internal/telephony/IccCard.java @@ -86,9 +86,8 @@ public abstract class IccCard { private static final int EVENT_QUERY_FACILITY_FDN_DONE = 10; private static final int EVENT_CHANGE_FACILITY_FDN_DONE = 11; - // FIXME: remove mot from property static final boolean LTE_AVAILABLE_ON_CDMA = - SystemProperties.getBoolean("ro.mot.lte_on_cdma", false); + SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA, false); /* UNKNOWN is a transient state, for example, after uesr inputs ICC pin under diff --git a/telephony/java/com/android/internal/telephony/PhoneFactory.java b/telephony/java/com/android/internal/telephony/PhoneFactory.java index c25a53de495a..ab0bb63f17b4 100644 --- a/telephony/java/com/android/internal/telephony/PhoneFactory.java +++ b/telephony/java/com/android/internal/telephony/PhoneFactory.java @@ -37,7 +37,7 @@ public class PhoneFactory { static final int SOCKET_OPEN_RETRY_MILLIS = 2 * 1000; static final int SOCKET_OPEN_MAX_RETRY = 3; static final boolean LTE_AVAILABLE_ON_CDMA = - SystemProperties.getBoolean("ro.mot.lte_on_cdma", false); + SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA, false); //***** Class Variables @@ -160,7 +160,8 @@ public class PhoneFactory { return Phone.PHONE_TYPE_CDMA; case RILConstants.NETWORK_MODE_LTE_ONLY: - if (SystemProperties.getBoolean("ro.mot.lte_on_cdma", false)) { + if (SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA, + false)) { return Phone.PHONE_TYPE_CDMA; } else { return Phone.PHONE_TYPE_GSM; diff --git a/telephony/java/com/android/internal/telephony/RIL.java b/telephony/java/com/android/internal/telephony/RIL.java index 970cf129cf71..88aed28384c5 100644 --- a/telephony/java/com/android/internal/telephony/RIL.java +++ b/telephony/java/com/android/internal/telephony/RIL.java @@ -639,7 +639,8 @@ public final class RIL extends BaseCommands implements CommandsInterface { mPhoneType = RILConstants.CDMA_PHONE; break; case RILConstants.NETWORK_MODE_LTE_ONLY: - if (SystemProperties.getBoolean("ro.mot.lte_on_cdma", false)) { + if (SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA, + false)) { mPhoneType = RILConstants.CDMA_PHONE; } else { mPhoneType = RILConstants.GSM_PHONE; diff --git a/telephony/java/com/android/internal/telephony/TelephonyProperties.java b/telephony/java/com/android/internal/telephony/TelephonyProperties.java index e6189be1622f..c4fab66f5c79 100644 --- a/telephony/java/com/android/internal/telephony/TelephonyProperties.java +++ b/telephony/java/com/android/internal/telephony/TelephonyProperties.java @@ -72,6 +72,11 @@ public interface TelephonyProperties */ static final String PROPERTY_OPERATOR_ISO_COUNTRY = "gsm.operator.iso-country"; + /** 'true' if device supports both LTE and CDMA mode of operation. + * Availability: Set only on devices supporting LTE and CDMA. + */ + static final String PROPERTY_NETWORK_LTE_ON_CDMA = "ro.telephony.lte_on_cdma"; + static final String CURRENT_ACTIVE_PHONE = "gsm.current.phone-type"; //****** SIM Card diff --git a/telephony/java/com/android/internal/telephony/gsm/SimCard.java b/telephony/java/com/android/internal/telephony/gsm/SimCard.java index 5a2f871fe3e1..781746ca3419 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SimCard.java +++ b/telephony/java/com/android/internal/telephony/gsm/SimCard.java @@ -20,6 +20,7 @@ import android.util.Log; import com.android.internal.telephony.IccCard; import com.android.internal.telephony.PhoneBase; +import com.android.internal.telephony.TelephonyProperties; import android.os.SystemProperties; /** @@ -46,7 +47,7 @@ public final class SimCard extends IccCard { mPhone.mCM.registerForSIMReady(mHandler, EVENT_ICC_READY, null); updateStateProperty(); - if(SystemProperties.getBoolean("ro.mot.lte_on_cdma", false)) { + if(SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA, false)) { mPhone.mCM.registerForNVReady(mHandler, EVENT_ICC_READY, null); } } |