Snap for 12695596 from 3c5232c21163f527fb5de15e5cc1304cac04155f to 25Q1-release (48efcafa) · Commits · e / os / android_frameworks_opt_telephony

flags/uicc.aconfig

+19 −0

Original line number	Diff line number	Diff line
		@@ -88,3 +88,22 @@ flag {
		description: "This flag controls the type of API that retrieves ISIM records, either hidden or system type."
		bug:"359721349"
		}

		# OWNER=jinjeong TARGET=25Q2
		flag {
		name: "carrier_id_from_carrier_identifier"
		namespace: "telephony"
		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
		}
		}

+14 −10

Original line number	Diff line number	Diff line
		@@ -275,19 +275,23 @@ public class CarrierInfoManager {
		* 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
		*
		* @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 (!forceResetAll) {
		if (now - mLastAccessResetCarrierKey < RESET_CARRIER_KEY_RATE_LIMIT) {
		Log.i(LOG_TAG, "resetCarrierKeysForImsiEncryption: Access rate exceeded");
		return;
		}
		mLastAccessResetCarrierKey = now;
		}

		int subId = SubscriptionManager.getSubscriptionId(mPhoneId);
		if (!SubscriptionManager.isValidSubscriptionId(subId)) {

+6 −1

Original line number	Diff line number	Diff line
		@@ -2189,7 +2189,12 @@ public class GsmCdmaPhone extends Phone {

		@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

+10 −0

Original line number	Diff line number	Diff line
		@@ -4075,6 +4075,16 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		return;
		}

		/**
		* 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
		*/