diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-11-05 21:09:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-05 21:09:31 +0000 |
| commit | 5021f4fa8d81c094fc69bf748acc48691e9e4415 (patch) | |
| tree | f9b021a436342008709babfff27df6f4f4407414 | |
| parent | 27f179c338705abdc538d98db6879b2a25ff2d8e (diff) | |
| parent | e0009196c439ff01889f821136181cb049536c7e (diff) | |
| download | Telephony-android10-tests-release.tar.gz | |
Merge "Snap for 5986893 from 843c0ce58eec1199b5dcf3e764ac7c6bee6edbdd to android10-tests-release" into android10-tests-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android10-tests-release
| -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; |