| commit | fd100180849672173bf76b90e5cfa032f55cebae | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Thu Aug 13 13:20:38 2020 -0700 |
| committer | Jordan Liu <jminjie@google.com> | Thu Aug 13 20:22:45 2020 +0000 |
| tree | 1bb19153a3de832876fdbe2367f183513c151ea0 | |
| parent | b26db37949f7e75a5862160762294a4170060b2c [diff] |
Do not filter by APN_SET_ID for emergency APNs Bug: 162567966 Test: manual Change-Id: Ie435a285aa5a7c1d6e3f3983cdc1892757ce78a5
diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java index 8d54dbc..9d062ab 100644 --- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java +++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
@@ -3416,7 +3416,8 @@ 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);