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

Commit 6c62e6a5 authored by Wei Liu's avatar Wei Liu Committed by Android Git Automerger
Browse files

am 7b779068: am 4c3aa35e: roamingProtocol should be used for roaming. 

* commit '7b779068':
  roamingProtocol should be used for roaming.
parents fe9a83d5 7b779068

src/java/com/android/internal/telephony/dataconnection/DataProfile.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ public class DataProfile { 
    }

    }





    DataProfile(ApnSetting apn, boolean isRoaming) {

    DataProfile(ApnSetting apn, boolean isRoaming) {

        this(apn.profileId, apn.apn, isRoaming? apn.protocol : apn.roamingProtocol,

        this(apn.profileId, apn.apn, isRoaming? apn.roamingProtocol : apn.protocol,

                apn.authType, apn.user, apn.password, apn.bearerBitmask == 0 ? TYPE_COMMON :

                apn.authType, apn.user, apn.password, apn.bearerBitmask == 0 ? TYPE_COMMON :

                        (ServiceState.hasCdma(apn.bearerBitmask) ? TYPE_3GPP2 : TYPE_3GPP),

                        (ServiceState.hasCdma(apn.bearerBitmask) ? TYPE_3GPP2 : TYPE_3GPP),

                apn.maxConnsTime, apn.maxConns, apn.waitTime, apn.carrierEnabled);

                apn.maxConnsTime, apn.maxConns, apn.waitTime, apn.carrierEnabled);