Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not merge: Telephony: Rename lte_on_cdma property.

Browse Source 
Fix Issue: 3479211. Dont use Mot property in Android Framework.

Change-Id: I1c13af5d00bf8c246ee6ecbedd1d1977a75c7142
This commit is contained in:
Ramesh Sudini
2011-03-09 14:22:39 -06:00
committed by Wink Saville
parent f57276154a
commit e62dee25e5
6 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/com/android/internal/telephony/CommandsInterface.java
View File

@@ -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) */

3
telephony/java/com/android/internal/telephony/IccCard.java
View File

@@ -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

5
telephony/java/com/android/internal/telephony/PhoneFactory.java
View File

@@ -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;

3
telephony/java/com/android/internal/telephony/RIL.java
View File

@@ -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;

5
telephony/java/com/android/internal/telephony/TelephonyProperties.java
View File

@@ -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

3
telephony/java/com/android/internal/telephony/gsm/SimCard.java
View File

@@ -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);
}
}