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

Commit 28a7a059 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 881d5387: Merge "frameworks/base: Support for LTE network modes" 

* commit '881d5387':
  frameworks/base: Support for LTE network modes
parents 380b45b8 881d5387

telephony/java/android/telephony/TelephonyManager.java

+2 −0
Original line number Diff line number Diff line
@@ -377,6 +377,8 @@ public class TelephonyManager { 
        case RILConstants.NETWORK_MODE_GSM_ONLY:

        case RILConstants.NETWORK_MODE_WCDMA_ONLY:

        case RILConstants.NETWORK_MODE_GSM_UMTS:

        case RILConstants.NETWORK_MODE_LTE_GSM_WCDMA:

        case RILConstants.NETWORK_MODE_LTE_WCDMA:

            return PhoneConstants.PHONE_TYPE_GSM;



        // Use CDMA Phone for the global mode including CDMA

telephony/java/com/android/internal/telephony/RILConstants.java

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public interface RILConstants { 
    int NETWORK_MODE_LTE_GSM_WCDMA  = 9; /* LTE, GSM/WCDMA */

    int NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA = 10; /* LTE, CDMA, EvDo, GSM/WCDMA */

    int NETWORK_MODE_LTE_ONLY       = 11; /* LTE Only mode. */



    int NETWORK_MODE_LTE_WCDMA      = 12; /* LTE/WCDMA */

    int PREFERRED_NETWORK_MODE      = NETWORK_MODE_WCDMA_PREF;



    int CDMA_CELL_BROADCAST_SMS_DISABLED = 1;