commit 79ec0543dc9b564c8c20e177b294eb8d044af614
author pkanwar <pkanwar@google.com> Mon Jul 31 14:10:01 2017 -0700
committer pkanwar <pkanwar@google.com> Fri Nov 17 11:57:26 2017 -0800
tree 4f242ab470f54c6920140becf148a4342fcd7ff9
parent 8aa5742bd2081567de02f59b4c9d58c36a16395a

Building IMSI support for encryption.

Provide ability to delete keys from the database. Will be used when
network is reset.
BUG: 35606429
Test: manual

Change-Id: I8a6c01c383396cb5dda0a45fbdf1ca88ee2b8fcb
(cherry picked from commit 65b8cc3ff023f6b98e47eff5ccccf04f5da727cf)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index ea57c81..ec42f80 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -79,6 +79,7 @@
 import com.android.ims.internal.IImsServiceFeatureListener;
 import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.CallStateException;
+import com.android.internal.telephony.CarrierInfoManager;
 import com.android.internal.telephony.CellNetworkScanResult;
 import com.android.internal.telephony.CommandException;
 import com.android.internal.telephony.DefaultPhoneNotifier;
@@ -3269,6 +3270,8 @@
                 setPreferredNetworkType(subId, Phone.PREFERRED_NT_MODE);
                 // Turn off roaming
                 mPhone.setDataRoamingEnabled(false);
+                // Remove IMSI encryption keys from Carrier DB.
+                CarrierInfoManager.deleteAllCarrierKeysForImsiEncryption(mPhone.getContext());
             }
         } finally {
             Binder.restoreCallingIdentity(identity);