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

Commit 82e3843b authored by Dheeraj Shetty's avatar Dheeraj Shetty
Browse files

Set username and password for default emergency APN 

Set the username and password to avoid NullPointerException
in RIL.

Test: Manual
Bug: 142369363
Change-Id: I3cb50723a5d88099090fbf39ca7164fe985dfd68
parent d82d8d5f

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

+5 −2
Original line number Diff line number Diff line
@@ -4129,6 +4129,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();
@@ -4790,8 +4793,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())