Snap for 13580881 from 46aeb8a7e16cec93e5224353d919db5f057aa250 to 25Q3-release (14ba30b1) · Commits · e / os / android_frameworks_opt_telephony

flags/uicc.aconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -63,17 +63,6 @@ flag {
		bug:"335257880"
		}

		# OWNER=arunvoddu TARGET=24Q4
		flag {
		name: "ignore_carrierid_reset_for_sim_removal"
		namespace: "telephony"
		description: "This flag controls the carrierId reset while imsi key deletion time upon sim ejection."
		bug:"366178705"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		# OWNER=jhyoon TARGET=25Q2
		flag {
		name: "support_isim_record"

+3 −17

Original line number	Diff line number	Diff line
		@@ -177,26 +177,17 @@ public class CarrierKeyDownloadManager extends Handler {
		TelephonyManager.class)
		.createForSubscriptionId(subId);
		}
		if (Flags.ignoreCarrieridResetForSimRemoval()) {
		if (carrierId > 0) {
		mCarrierId = carrierId;
		}
		} else {
		mCarrierId = carrierId;
		}
		updateSimOperator();
		// If device is screen locked do not proceed to handle
		// EVENT_ALARM_OR_CONFIG_CHANGE
		printDeviceLockStatus();
		if (Flags.ignoreCarrieridResetForSimRemoval()) {
		if (!mUserManager.isUserUnlocked()) {
		mIsRequiredToHandleUnlock = true;
		return;
		}
		} else if (mKeyguardManager.isDeviceLocked()) {
		mIsRequiredToHandleUnlock = true;
		return;
		}
		logd("Carrier Config changed: slotIndex=" + slotIndex);
		sendEmptyMessage(EVENT_ALARM_OR_CONFIG_CHANGE);

		@@ -338,12 +329,7 @@ public class CarrierKeyDownloadManager extends Handler {
		} else {
		// If download fails due to the device user lock, we will reattempt once
		// the device is unlocked.
		if (Flags.ignoreCarrieridResetForSimRemoval()) {
		mIsRequiredToHandleUnlock = !mUserManager.isUserUnlocked();
		} else {
		mIsRequiredToHandleUnlock = mKeyguardManager.isDeviceLocked();
		}

		loge("hasActiveDataConnection = " + hasActiveDataNetwork
		+ " isDeviceUserLocked = " + mIsRequiredToHandleUnlock);
		if (!hasActiveDataNetwork) {

+2 −0

Original line number	Diff line number	Diff line
		@@ -440,6 +440,8 @@ public class ContextFixture implements TestFixture<Context> {

		@Override
		public void unregisterReceiver(BroadcastReceiver receiver) {
		mBroadcastReceiversByAction.entries().removeIf(entry
		-> receiver == entry.getValue());
		}

		@Override