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/flags/uicc.aconfig b/flags/uicc.aconfig
index f9b208b..aed4bff 100644
--- a/flags/uicc.aconfig
+++ b/flags/uicc.aconfig
@@ -96,3 +96,14 @@
description: "This flag controls to get a carrier id using a carrier identifier."
bug:"378778278"
}
+
+# OWNER=arunvoddu TARGET=25Q2
+flag {
+ name: "force_imsi_certificate_delete"
+ namespace: "telephony"
+ description: "This flag controls the IMSI certificate delete with out any condition."
+ bug:"235296888"
+ metadata {
+ purpose: PURPOSE_BUGFIX
+ }
+}
diff --git a/src/java/com/android/internal/telephony/CarrierInfoManager.java b/src/java/com/android/internal/telephony/CarrierInfoManager.java
index 8364c0a..206770d 100644
--- a/src/java/com/android/internal/telephony/CarrierInfoManager.java
+++ b/src/java/com/android/internal/telephony/CarrierInfoManager.java
@@ -273,21 +273,25 @@
/**
* Resets the Carrier Keys in the database. This involves 2 steps:
- * 1. Delete the keys from the database.
- * 2. Send an intent to download new Certificates.
- * @param context Context
- * @param mPhoneId phoneId
+ * 1. Delete the keys from the database.
+ * 2. Send an intent to download new Certificates.
*
+ * @param context Context
+ * @param mPhoneId phoneId
+ * @param forceResetAll to skip the check of the RESET_CARRIER_KEY_RATE_LIMIT.
*/
- public void resetCarrierKeysForImsiEncryption(Context context, int mPhoneId) {
- Log.i(LOG_TAG, "resetting carrier key");
+ public void resetCarrierKeysForImsiEncryption(Context context, int mPhoneId,
+ boolean forceResetAll) {
+ Log.i(LOG_TAG, "resetting carrier key, forceResetAll = " +forceResetAll);
// Check rate limit.
long now = System.currentTimeMillis();
- if (now - mLastAccessResetCarrierKey < RESET_CARRIER_KEY_RATE_LIMIT) {
- Log.i(LOG_TAG, "resetCarrierKeysForImsiEncryption: Access rate exceeded");
- return;
+ if (!forceResetAll) {
+ if (now - mLastAccessResetCarrierKey < RESET_CARRIER_KEY_RATE_LIMIT) {
+ Log.i(LOG_TAG, "resetCarrierKeysForImsiEncryption: Access rate exceeded");
+ return;
+ }
+ mLastAccessResetCarrierKey = now;
}
- mLastAccessResetCarrierKey = now;
int subId = SubscriptionManager.getSubscriptionId(mPhoneId);
if (!SubscriptionManager.isValidSubscriptionId(subId)) {
diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
index 6a6e4d0..175bbb5 100644
--- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
@@ -2189,7 +2189,12 @@
@Override
public void resetCarrierKeysForImsiEncryption() {
- mCIM.resetCarrierKeysForImsiEncryption(mContext, mPhoneId);
+ mCIM.resetCarrierKeysForImsiEncryption(mContext, mPhoneId, false);
+ }
+
+ @Override
+ public void resetCarrierKeysForImsiEncryption(boolean forceResetAll) {
+ mCIM.resetCarrierKeysForImsiEncryption(mContext, mPhoneId, forceResetAll);
}
@Override
diff --git a/src/java/com/android/internal/telephony/Phone.java b/src/java/com/android/internal/telephony/Phone.java
index ab9be76..5998d46 100644
--- a/src/java/com/android/internal/telephony/Phone.java
+++ b/src/java/com/android/internal/telephony/Phone.java
@@ -4076,6 +4076,16 @@
}
/**
+ * Resets the Carrier Keys in the database. This involves 2 steps:
+ * 1. Delete the keys from the database.
+ * 2. Send an intent to download new Certificates.
+ *
+ * @param forceResetAll : Force delete the downloaded key if any.
+ */
+ public void resetCarrierKeysForImsiEncryption(boolean forceResetAll) {
+ }
+
+ /**
* Return if UT capability of ImsPhone is enabled or not
*/
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)