commit bfe80e39f2d73429b3dc0c208cd6062b2ea61c1f
author Torbjorn Eklund <torbjorn.eklund@sony.com> Mon Sep 24 10:57:37 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 24 10:57:37 2018 -0700
tree 72c5b27cec7575b9f1b104123dca46d375196815
parent a553a09700bb13d4ed7b2525cb520fd5c4801e8d
parent db353e2c4a637860f5d61eb800f3534377a1289b

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

Change-Id: Ie2ad2655b5fc399610acdcfd8327e99c60b7e2a8

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 1d6e81e..86e9f7b 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -240,7 +240,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);