commit b7e3552b835b2b640dc7179405285a03581c0b73
author Youming Ye <paulye@google.com> Tue Sep 25 17:04:10 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 25 17:04:10 2018 +0000
tree ca08726424c829d135a55d5907fbd601dcf9c5af
parent f6f7079709bcb88da6f2ecca575faabae45745f0
parent 20fb65fb84caa08586f481695cc103e311597118

Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device"

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 df0b1b4..beeaab3 100755
--- a/src/com/android/settings/network/ApnSettings.java
+++ b/src/com/android/settings/network/ApnSettings.java
@@ -186,7 +186,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) {