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

Commit 829c6271 authored by Dheeraj Shetty's avatar Dheeraj Shetty Committed by android-build-merger
Browse files

Merge "Set username and password for default emergency APN" am: 5766fc40 am: 6fe0af99 

am: cb76f2ed

Change-Id: Id2344b0dabc7692e5238991106b2251b7621a652
parents 749448d9 cb76f2ed

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

+5 −2
Original line number Diff line number Diff line
@@ -4253,6 +4253,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();
@@ -4944,8 +4947,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())