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

Commit 9772a501 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 42b3a6a7: am c59c6dd6: Merge "For NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA... 

am 42b3a6a7: am c59c6dd6: Merge "For NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA default to PHONE_TYPE_GSM" into klp-dev

* commit '42b3a6a7':
  For NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA default to PHONE_TYPE_GSM
parents 8474ae7d 42b3a6a7

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -412,12 +412,12 @@ public class TelephonyManager { 
        case RILConstants.NETWORK_MODE_GSM_UMTS:

        case RILConstants.NETWORK_MODE_LTE_GSM_WCDMA:

        case RILConstants.NETWORK_MODE_LTE_WCDMA:

        case RILConstants.NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA:

            return PhoneConstants.PHONE_TYPE_GSM;



        // Use CDMA Phone for the global mode including CDMA

        case RILConstants.NETWORK_MODE_GLOBAL:

        case RILConstants.NETWORK_MODE_LTE_CDMA_EVDO:

        case RILConstants.NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA:

            return PhoneConstants.PHONE_TYPE_CDMA;



        case RILConstants.NETWORK_MODE_LTE_ONLY: