commit 34fa376b3bf5781af271df3233f32ae208af8162
author Jordan Liu <jminjie@google.com> Fri May 25 15:20:18 2018 -0700
committer Jordan Liu <jminjie@google.com> Thu May 31 19:25:07 2018 +0000
tree 9617a416e7046a59945f73044ce0e7f5cad13bcc
parent 0f5574a23d2a51e47b8ccc8466fd5caacb468765

Default and CarrierApp Carrierconfigs are separate

Should be saved and restored separately.

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

src/com/android/phone/CarrierConfigLoader.java

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