Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e62dee25 authored by Ramesh Sudini's avatar Ramesh Sudini Committed by Wink Saville
Browse files

Do not merge: Telephony: Rename lte_on_cdma property. 

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

Change-Id: I1c13af5d00bf8c246ee6ecbedd1d1977a75c7142
parent f5727615

telephony/java/com/android/internal/telephony/CommandsInterface.java

+1 −2
Original line number Diff line number Diff line
@@ -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) */

telephony/java/com/android/internal/telephony/IccCard.java

+1 −2
Original line number Diff line number Diff line
@@ -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

telephony/java/com/android/internal/telephony/PhoneFactory.java

+3 −2
Original line number Diff line number Diff line
@@ -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;

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

+2 −1
Original line number Diff line number Diff line
@@ -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;

telephony/java/com/android/internal/telephony/TelephonyProperties.java

+5 −0
Original line number Diff line number Diff line
@@ -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