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

Commit 326c5e97 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "new TelephonyManager API for preferred network mode" am: 62d29634 

am: c5a090c7

Change-Id: Iea0ece63f2b4abf6c9b6b99282d3840a50cf2e0a
parents 5afb0ca0 c5a090c7

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

+2 −2
Original line number Diff line number Diff line
@@ -2854,8 +2854,8 @@ public class GsmCdmaPhone extends Phone { 
         *  selection is disallowed. So we should force auto select mode.

         */

        if (isManualSelProhibitedInGlobalMode()

                && ((nwMode == Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA)

                        || (nwMode == Phone.NT_MODE_GLOBAL)) ){

                && ((nwMode == TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA)

                        || (nwMode == TelephonyManager.NETWORK_MODE_GLOBAL)) ){

            logd("Should force auto network select mode = " + nwMode);

            return true;

        } else {

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

+0 −30
Original line number Diff line number Diff line
@@ -176,36 +176,6 @@ public interface PhoneInternalInterface { 
    static final int BM_US_2500M    = RILConstants.BAND_MODE_USA_2500M;

    static final int BM_NUM_BAND_MODES = 19; //Total number of band modes



    // Used for preferred network type

    // Note NT_* substitute RILConstants.NETWORK_MODE_* above the Phone

    int NT_MODE_WCDMA_PREF   = RILConstants.NETWORK_MODE_WCDMA_PREF;

    int NT_MODE_GSM_ONLY     = RILConstants.NETWORK_MODE_GSM_ONLY;

    int NT_MODE_WCDMA_ONLY   = RILConstants.NETWORK_MODE_WCDMA_ONLY;

    int NT_MODE_GSM_UMTS     = RILConstants.NETWORK_MODE_GSM_UMTS;



    int NT_MODE_CDMA         = RILConstants.NETWORK_MODE_CDMA;



    int NT_MODE_CDMA_NO_EVDO = RILConstants.NETWORK_MODE_CDMA_NO_EVDO;

    int NT_MODE_EVDO_NO_CDMA = RILConstants.NETWORK_MODE_EVDO_NO_CDMA;

    int NT_MODE_GLOBAL       = RILConstants.NETWORK_MODE_GLOBAL;



    int NT_MODE_LTE_CDMA_AND_EVDO        = RILConstants.NETWORK_MODE_LTE_CDMA_EVDO;

    int NT_MODE_LTE_GSM_WCDMA            = RILConstants.NETWORK_MODE_LTE_GSM_WCDMA;

    int NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA  = RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA;

    int NT_MODE_LTE_ONLY                 = RILConstants.NETWORK_MODE_LTE_ONLY;

    int NT_MODE_LTE_WCDMA                = RILConstants.NETWORK_MODE_LTE_WCDMA;



    int NT_MODE_TDSCDMA_ONLY            = RILConstants.NETWORK_MODE_TDSCDMA_ONLY;

    int NT_MODE_TDSCDMA_WCDMA           = RILConstants.NETWORK_MODE_TDSCDMA_WCDMA;

    int NT_MODE_LTE_TDSCDMA             = RILConstants.NETWORK_MODE_LTE_TDSCDMA;

    int NT_MODE_TDSCDMA_GSM             = RILConstants.NETWORK_MODE_TDSCDMA_GSM;

    int NT_MODE_LTE_TDSCDMA_GSM         = RILConstants.NETWORK_MODE_LTE_TDSCDMA_GSM;

    int NT_MODE_TDSCDMA_GSM_WCDMA       = RILConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA;

    int NT_MODE_LTE_TDSCDMA_WCDMA       = RILConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA;

    int NT_MODE_LTE_TDSCDMA_GSM_WCDMA   = RILConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA;

    int NT_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = RILConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;

    int NT_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA = RILConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;



    int PREFERRED_NT_MODE                = RILConstants.PREFERRED_NETWORK_MODE;



    // Used for CDMA roaming mode