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

Commit 5766fc40 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Set username and password for default emergency APN"

parents 939d5d1f 82e3843b

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

+5 −2
Original line number Diff line number Diff line
@@ -4131,6 +4131,9 @@ public class DcTracker extends Handler { 
        mEmergencyApn = new ApnSetting.Builder()

                .setEntryName("Emergency")

                .setProtocol(ApnSetting.PROTOCOL_IPV4V6)

                .setRoamingProtocol(ApnSetting.PROTOCOL_IPV4V6)

                .setNetworkTypeBitmask((int)(TelephonyManager.NETWORK_TYPE_BITMASK_LTE

                | TelephonyManager.NETWORK_TYPE_BITMASK_IWLAN))

                .setApnName("sos")

                .setApnTypeBitmask(ApnSetting.TYPE_EMERGENCY)

                .build();
@@ -4792,8 +4795,8 @@ public class DcTracker extends Handler { 
                .setApn(apn.getApnName())

                .setProtocolType(apn.getProtocol())

                .setAuthType(apn.getAuthType())

                .setUserName(apn.getUser())

                .setPassword(apn.getPassword())

                .setUserName(apn.getUser() == null ? "" : apn.getUser())

                .setPassword(apn.getPassword() == null ? "" : apn.getPassword())

                .setType(profileType)

                .setMaxConnectionsTime(apn.getMaxConnsTime())

                .setMaxConnections(apn.getMaxConns())