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

Commit bbba0756 authored by Amit Mahajan's avatar Amit Mahajan Committed by Automerger Merge Worker
Browse files

Merge "Do not filter by APN_SET_ID for emergency APNs" am: b8e1d9b5 am: 88d65b6d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1428974

Change-Id: Ia8cca665b2e641863c4e657e2d22fc4c006c112d
parents 42cc37f2 88d65b6d

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

+2 −1
Original line number Diff line number Diff line
@@ -3372,7 +3372,8 @@ public class DcTracker extends Handler { 
                if (apn.canSupportNetworkType(

                        ServiceState.rilRadioTechnologyToNetworkType(radioTech))) {

                    int preferredApnSetId = getPreferredApnSetId();

                    if (preferredApnSetId == Telephony.Carriers.NO_APN_SET_ID

                    if (apn.isEmergencyApn()

                            || preferredApnSetId == Telephony.Carriers.NO_APN_SET_ID

                            || preferredApnSetId == apn.getApnSetId()) {

                        if (VDBG) log("buildWaitingApns: adding apn=" + apn);

                        apnList.add(apn);