Snap for 12702769 from 394ffd623b238bd50e54f01bd9543c4a87d47754 to 25Q1-release (512b44a6) · Commits · e / os / android_frameworks_opt_telephony

flags/data.aconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -121,17 +121,6 @@ flag {
		}
		}

		# OWNER=jackyu TARGET=25Q1
		flag {
		name: "sim_disabled_graceful_tear_down"
		namespace: "telephony"
		description: "Gracefully tear down the networks when SIM is disabled."
		bug: "362372940"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		# OWNER=TBD TARGET=TBD
		flag {
		name: "oem_paid_private"

+8 −0

Original line number	Diff line number	Diff line
		@@ -2737,6 +2737,14 @@ public abstract class SMSDispatcher extends Handler {
		return mUnsentPartCount != null ? (mUnsentPartCount.get() == 0) : true;
		}

		/**
		* Returns the flag specifying whether any part of this {@link SmsTracker} failed to send
		* or not.
		*/
		protected boolean isAnyPartFailed() {
		return mAnyPartFailed != null && mAnyPartFailed.get();
		}

		/**
		* Persist a sent SMS if required:
		* 1. It is a text message

+5 −3

Original line number	Diff line number	Diff line
		@@ -1234,7 +1234,8 @@ public class SmsDispatchersController extends Handler {
		boolean isOverIms, boolean isLastSmsPart, boolean success) {
		notifySmsSentToEmergencyStateTracker(tracker.mDestAddress,
		tracker.mMessageId, isOverIms, isLastSmsPart, success);
		notifySmsSentToDatagramDispatcher(tracker.mUniqueMessageId, isLastSmsPart, success);
		notifySmsSentToDatagramDispatcher(tracker.mUniqueMessageId,
		tracker.isSinglePartOrLastPart(), !tracker.isAnyPartFailed());
		}

		/**
		@@ -1256,9 +1257,10 @@ public class SmsDispatchersController extends Handler {

		private void notifySmsSentToDatagramDispatcher(
		long messageId, boolean isLastSmsPart, boolean success) {
		if (SatelliteController.getInstance().shouldSendSmsToDatagramDispatcher(mPhone)) {
		if (SatelliteController.getInstance().shouldSendSmsToDatagramDispatcher(mPhone)
		&& isLastSmsPart) {
		DatagramDispatcher.getInstance().onSendSmsDone(
		mPhone.getSubId(), messageId, isLastSmsPart, success);
		mPhone.getSubId(), messageId, success);
		}
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -225,8 +225,6 @@ public class DataEvaluation {
		SIM_LOADED(true),
		/** SIM is removed. */
		SIM_REMOVAL(true),
		/** SIM is disabled. */
		SIM_DISABLED(true),
		/** Data profiles changed. */
		DATA_PROFILES_CHANGED(true),
		/** When service state changes.(For now only considering data RAT and data registration). */

+11 −11

Original line number	Diff line number	Diff line
		@@ -3542,6 +3542,15 @@ public class DataNetworkController extends Handler {
		mDataServiceBound.put(transport, bound);
		}

		/**
		* Called when SIM is absent.
		*/
		private void onSimAbsent() {
		log("onSimAbsent");
		sendMessage(obtainMessage(EVENT_REEVALUATE_EXISTING_DATA_NETWORKS,
		DataEvaluationReason.SIM_REMOVAL));
		}

		/**
		* Called when SIM state changes.
		*
		@@ -3550,22 +3559,13 @@ public class DataNetworkController extends Handler {
		private void onSimStateChanged(@SimState int simState) {
		log("onSimStateChanged: state=" + TelephonyManager.simStateToString(simState));
		if (mSimState != simState) {
		mSimState = simState;
		if (simState == TelephonyManager.SIM_STATE_ABSENT) {
		log("onSimStateChanged: SIM absent.");
		sendMessage(obtainMessage(EVENT_REEVALUATE_EXISTING_DATA_NETWORKS,
		DataEvaluationReason.SIM_REMOVAL));
		} else if (simState == TelephonyManager.SIM_STATE_NOT_READY
		&& mSimState == TelephonyManager.SIM_STATE_LOADED) {
		if (mFeatureFlags.simDisabledGracefulTearDown()) {
		log("onSimStateChanged: SIM disabled.");
		sendMessage(obtainMessage(EVENT_REEVALUATE_EXISTING_DATA_NETWORKS,
		DataEvaluationReason.SIM_DISABLED));
		}
		onSimAbsent();
		} else if (simState == TelephonyManager.SIM_STATE_LOADED) {
		sendMessage(obtainMessage(EVENT_REEVALUATE_UNSATISFIED_NETWORK_REQUESTS,
		DataEvaluationReason.SIM_LOADED));
		}
		mSimState = simState;
		mDataNetworkControllerCallbacks.forEach(callback -> callback.invokeFromExecutor(
		() -> callback.onSimStateChanged(mSimState)));
		}