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

Commit dc2df9c8 authored by Lalit Maganti's avatar Lalit Maganti
Browse files

Revert "new TelephonyManager API for preferred network mode" 

This reverts commit 73517c1f.

Reason for revert: Reason for revert: Causing failures on git_pi-dev-plus-aosp for docs and aosp_sailfish.

Change-Id: Ic468c614d3155623cb8394a689e82bea48751817
Merged-In: I902510e04a2a1e6fcc64320dc739ba8b7ea9d9f8
parent 73517c1f

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

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

         */

        if (isManualSelProhibitedInGlobalMode()

                && ((nwMode == TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA)

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

                && ((nwMode == Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA)

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

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

            return true;

        } else {

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

+30 −0
Original line number Diff line number Diff line
@@ -178,6 +178,36 @@ 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