commit 857e73adf2a453eff42a6fb878cf0faa5385d024
author Jordan Liu <jminjie@google.com> Fri Mar 05 16:24:04 2021 -0800
committer Jordan Liu <jminjie@google.com> Tue Mar 23 20:59:03 2021 +0000
tree 7f4d46d362eb45c964e7dd43aad524230a3c0388
parent e16cc7eebfbbce82ca062638e9d5c6b75c2a87de

Redownload carrier keys when resetting network settings

Bug: 175314655
Test: manual
Change-Id: I2b436784ae69bf562bd57cef74db514d001e4290
(cherry picked from commit 0561c9e1e5d1d94a75a4f62793278f2fca121786)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index d39832b..f91dd8d 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -139,7 +139,6 @@
 import com.android.internal.telephony.CallForwardInfo;
 import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.CallStateException;
-import com.android.internal.telephony.CarrierInfoManager;
 import com.android.internal.telephony.CarrierResolver;
 import com.android.internal.telephony.CellNetworkScanResult;
 import com.android.internal.telephony.CommandException;
@@ -7448,7 +7447,7 @@
                     phone.loadAllowedNetworksFromSubscriptionDatabase();
                 }
                 setDataRoamingEnabled(subId, getDefaultDataRoamingEnabled(subId));
-                CarrierInfoManager.deleteAllCarrierKeysForImsiEncryption(mApp);
+                getPhone(subId).resetCarrierKeysForImsiEncryption();
             }
             // There has been issues when Sms raw table somehow stores orphan
             // fragments. They lead to garbled message when new fragments come