commit 221c2331069cabefecf531d6bb43b9b05fb0af49
author Jordan Liu <jminjie@google.com> Fri May 25 15:20:18 2018 -0700
committer Jordan Liu <jminjie@google.com> Thu May 31 14:04:32 2018 -0700
tree 92b2a574aae33d3dd43b817360fee3ed1607eeae
parent 58bf5020c9b98f69afe09fcf125266a1d573ac02

Default and CarrierApp Carrierconfigs are separate

Should be saved and restored separately.

Bug: 80309931
Fixes: 80096583
Test: manual
Change-Id: I4d281979af457e415ab9c0194ddde433313c1224
Merged-In: I4d281979af457e415ab9c0194ddde433313c1224

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 86f0aa4..dab2177 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -390,7 +390,7 @@
                                     PersistableBundle config =
                                             resultData.getParcelable(KEY_CONFIG_BUNDLE);
                                     saveConfigToXml(
-                                            mPlatformCarrierConfigPackage, iccid, config);
+                                            getCarrierPackageForPhoneId(phoneId), iccid, config);
                                     mConfigFromCarrierApp[phoneId] = config;
                                     sendMessage(
                                             obtainMessage(