commit d976002deaf48f86edc3677e455575e2aa664466
author Youming Ye <paulye@google.com> Tue Sep 25 10:27:22 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 25 10:27:22 2018 -0700
tree fa4bc5a793045040b4002746ed836546c0cb24f0
parent bfe80e39f2d73429b3dc0c208cd6062b2ea61c1f
parent 31576aae7c69d1fb1bb613231876d6d707208a9d

Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device" am: b7e3552b83
am: 31576aae7c

Change-Id: Ib37954bccacb44b670ee6c1af6e7188fdd91a46a

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

diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java
index b47cb42..013ae8c 100755
--- a/src/com/android/settings/network/ApnSettings.java
+++ b/src/com/android/settings/network/ApnSettings.java
@@ -185,7 +185,7 @@
 
         CarrierConfigManager configManager = (CarrierConfigManager)
                 getSystemService(Context.CARRIER_CONFIG_SERVICE);
-        PersistableBundle b = configManager.getConfig();
+        PersistableBundle b = configManager.getConfigForSubId(mSubId);
         mHideImsApn = b.getBoolean(CarrierConfigManager.KEY_HIDE_IMS_APN_BOOL);
         mAllowAddingApns = b.getBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL);
         if (mAllowAddingApns) {