Introduced forceResetCarrierKeysForImsiEncryption TestAPI to delete Imsi Certificate.
CTS test case required to delete the IMSI certificate multiple times, where as
Framework allows to delete it only once in 12 Hours.
This API will delete the IMSI certificate with out any condition check.
Bug: 235296888
Test: cts-tradefed run cts -m CtsTelephonyTestCases
-t android.telephony.cts.TelephonyManagerTest
Flag: com.android.internal.telephony.flags.force_imsi_certificate_delete
Change-Id: I3bfb6b322388c4f39e3370c6c1e1792dfe48ded4
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index f3028cf..bb88426 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -8595,9 +8595,10 @@
setNetworkSelectionModeAutomatic(subId);
Phone phone = getPhone(subId);
cleanUpAllowedNetworkTypes(phone, subId);
+
setDataRoamingEnabled(subId, phone == null ? false
: phone.getDataSettingsManager().isDefaultDataRoamingEnabled());
- getPhone(subId).resetCarrierKeysForImsiEncryption();
+ getPhone(subId).resetCarrierKeysForImsiEncryption(true);
}
// There has been issues when Sms raw table somehow stores orphan
// fragments. They lead to garbled message when new fragments come