From 20fb65fb84caa08586f481695cc103e311597118 Mon Sep 17 00:00:00 2001 From: Yuchen Dong Date: Thu, 23 Aug 2018 17:32:40 +0900 Subject: [PATCH] Wrong Carrier Config values are used in ApnSettings for Multi SIM device In ApnSettings, it always uses Carrier Config values of default subId. So, wrong carrier config values are used for non-default subId. To resolve this issue, read Carrier Config values based on subId. Test: manual - Check Carrier Config values are read based on subId. Bug: 111172301 Change-Id: I87e4cbb2e8020198fa03c2c84ef9bd10d5970341 --- src/com/android/settings/network/ApnSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java index 288cccbe2b0..e9d496a515a 100755 --- a/src/com/android/settings/network/ApnSettings.java +++ b/src/com/android/settings/network/ApnSettings.java @@ -185,7 +185,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements 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) {