commit 25249e4314f3a557ddf4a3f37f2ad6a1b9560d5d
author Torbjorn Eklund <torbjorn.eklund@sony.com> Mon Sep 24 11:08:59 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 24 11:08:59 2018 -0700
tree b85e94c91229f990d65c5325ec0b3cfdcd8cd6a4
parent 9f553bc863a7b066783eec9738addbd3209c37ae
parent bfe80e39f2d73429b3dc0c208cd6062b2ea61c1f

Merge "ApnEditor: Consider subId when reading carrier config" am: f6f7079709 am: db353e2c4a
am: bfe80e39f2

Change-Id: I848fd4084f43b2aeb69cb5175c1c10de3355c21f

src/com/android/settings/network/ApnEditor.java

diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java
index 47a75c3..6b99e1f 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -241,7 +241,7 @@
         CarrierConfigManager configManager = (CarrierConfigManager)
                 getSystemService(Context.CARRIER_CONFIG_SERVICE);
         if (configManager != null) {
-            PersistableBundle b = configManager.getConfig();
+            PersistableBundle b = configManager.getConfigForSubId(mSubId);
             if (b != null) {
                 mReadOnlyApnTypes = b.getStringArray(
                         CarrierConfigManager.KEY_READ_ONLY_APN_TYPES_STRING_ARRAY);