ApnEditor: Consider subId when reading carrier config

Considers subId when reading carrier config values
KEY_READ_ONLY_APN_TYPES_STRING_ARRAY and
KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY.

This ensures that the APN will be editable or non-editable correctly
when using dual sim.

Bug: 112929355
Test: Manual
Change-Id: I2186dd5e1f71ca5361309a7314f84cf4fa2d3937
This commit is contained in:
Torbjorn Eklund
2018-07-25 22:14:30 +02:00
parent 41f9566da8
commit ae8e62f4d0

View File

@@ -241,7 +241,7 @@ public class ApnEditor extends SettingsPreferenceFragment
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);