diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-08-20 22:40:04 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-08-20 22:40:04 +0000 |
| commit | 4ca869a86d35d23e903b2cb75f04099964c7b078 (patch) | |
| tree | 1bb19153a3de832876fdbe2367f183513c151ea0 | |
| parent | 391c04f765281b0f4287148e503dd23c4d2bfe7b (diff) | |
| parent | fd100180849672173bf76b90e5cfa032f55cebae (diff) | |
| download | telephony-4ca869a86d35d23e903b2cb75f04099964c7b078.tar.gz | |
Snap for 6779986 from fd100180849672173bf76b90e5cfa032f55cebae to rvc-d1-b-release
Change-Id: Id75714dd807bf15bbfc9f47a79c93378315c88df
| -rw-r--r-- | src/java/com/android/internal/telephony/dataconnection/DcTracker.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java index 8d54dbc2e8..9d062ab258 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 @@ 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); |