diff options
| -rw-r--r-- | src/com/android/phone/CarrierConfigLoader.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java index ed95a2c9d..d7c1a59be 100644 --- a/src/com/android/phone/CarrierConfigLoader.java +++ b/src/com/android/phone/CarrierConfigLoader.java @@ -285,8 +285,8 @@ public class CarrierConfigLoader extends ICarrierConfigLoader.Stub { } PersistableBundle config = resultData.getParcelable(KEY_CONFIG_BUNDLE); - saveConfigToXml( - mPlatformCarrierConfigPackage, phoneId, config); + saveConfigToXml(mPlatformCarrierConfigPackage, phoneId, + carrierId, config); mConfigFromDefaultApp[phoneId] = config; sendMessage( obtainMessage( @@ -416,8 +416,8 @@ public class CarrierConfigLoader extends ICarrierConfigLoader.Stub { } PersistableBundle config = resultData.getParcelable(KEY_CONFIG_BUNDLE); - saveConfigToXml( - getCarrierPackageForPhoneId(phoneId), phoneId, config); + saveConfigToXml(getCarrierPackageForPhoneId(phoneId), phoneId, + carrierId, config); mConfigFromCarrierApp[phoneId] = config; sendMessage( obtainMessage( @@ -705,9 +705,11 @@ public class CarrierConfigLoader extends ICarrierConfigLoader.Stub { * * @param packageName the name of the package from which we fetched this bundle. * @param phoneId the phone ID. + * @param carrierId contains all carrier-identifying information. * @param config the bundle to be written. Null will be treated as an empty bundle. */ - private void saveConfigToXml(String packageName, int phoneId, PersistableBundle config) { + private void saveConfigToXml(String packageName, int phoneId, CarrierIdentifier carrierId, + PersistableBundle config) { if (SubscriptionManager.getSimStateForSlotIndex(phoneId) != TelephonyManager.SIM_STATE_LOADED) { loge("Skip save config because SIM records are not loaded."); @@ -715,7 +717,7 @@ public class CarrierConfigLoader extends ICarrierConfigLoader.Stub { } final String iccid = getIccIdForPhoneId(phoneId); - final int cid = getSpecificCarrierIdForPhoneId(phoneId); + final int cid = carrierId.getSpecificCarrierId(); if (packageName == null || iccid == null) { loge("Cannot save config with null packageName or iccid."); return; |