diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-08-17 12:32:50 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-08-17 12:32:50 +0000 |
| commit | e7bba10b5e664d2da74cbbd6c5897de7bacd3639 (patch) | |
| tree | 1bb19153a3de832876fdbe2367f183513c151ea0 | |
| parent | 49f47598c4a05b2ae5661e75519122bbd67cee3d (diff) | |
| parent | e5fc4d715973deea7551c961908dd0f41362f936 (diff) | |
| download | telephony-android11-d1-s1-release.tar.gz | |
Merge cherrypicks of [12392108, 12392184, 12392094, 12392168, 12392169, 12392170, 12392171, 12392109, 12392172, 12392173, 12392185, 12392186, 12392207, 12392001, 12392242, 12392019] into rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r11android-11.0.0_r10android11-d1-s1-release
Change-Id: I81dacfe44cbf2a424b60e7370301377d089eb8b8
| -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); |