Snap for 12651823 from 7efa9e45b95cc9b9731f70da46e8fdf7fac63811 to 25Q1-release (1ee375b9) · Commits · e / os / android_frameworks_opt_telephony

flags/subscription.aconfig

+8 −0

Original line number	Diff line number	Diff line
		@@ -81,3 +81,11 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		# OWNER=jmattis TARGET=25Q2
		flag {
		name: "subscription_plan_allow_status_and_end_date"
		namespace: "telephony"
		description: "Provide APIs to retrieve the status and recurrence rule info on a subscription plan"
		bug: "357272015"
		}

+3 −4

Original line number	Diff line number	Diff line
		@@ -692,13 +692,12 @@ public abstract class InboundSmsHandler extends StateMachine {
		if (mFeatureFlags.carrierRoamingNbIotNtn()) {
		if (result == Intents.RESULT_SMS_HANDLED) {
		SatelliteController satelliteController = SatelliteController.getInstance();
		if (satelliteController == null) {
		log("SatelliteController is not initialized");
		return;
		}
		if (satelliteController != null
		&& satelliteController.shouldSendSmsToDatagramDispatcher(mPhone)) {
		satelliteController.onSmsReceived(mPhone.getSubId());
		}
		}
		}

		// RESULT_OK means that the SMS will be acknowledged by special handling,
		// e.g. for SMS-PP data download. Any other result, we should ack here.

+3 −1

Original line number	Diff line number	Diff line
		@@ -1257,8 +1257,10 @@ public class DatagramDispatcher extends Handler {
		}

		private boolean shouldPollMtSms() {
		SatelliteController satelliteController = SatelliteController.getInstance();
		Phone satellitePhone = satelliteController.getSatellitePhone();
		return isEnabledMtSmsPolling()
		&& SatelliteController.getInstance().isInCarrierRoamingNbIotNtn();
		&& satelliteController.shouldSendSmsToDatagramDispatcher(satellitePhone);
		}

		@GuardedBy("mLock")

+1 −1

Original line number	Diff line number	Diff line
		@@ -7835,7 +7835,7 @@ public class SatelliteController extends Handler {
		}

		/** Returns whether to send SMS to DatagramDispatcher or not. */
		public boolean shouldSendSmsToDatagramDispatcher(@NonNull Phone phone) {
		public boolean shouldSendSmsToDatagramDispatcher(@Nullable Phone phone) {
		if (!isInCarrierRoamingNbIotNtn(phone)) {
		return false;
		}

+12 −2

Original line number	Diff line number	Diff line
		@@ -33,6 +33,8 @@ import com.android.internal.telephony.flags.FeatureFlags;
		import com.android.internal.telephony.flags.FeatureFlagsImpl;
		import com.android.telephony.Rlog;

		import dalvik.system.CloseGuard;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		@@ -46,6 +48,7 @@ public class UiccPort {
		// The lock object is created by UiccSlot that owns this UiccCard - this is to share the lock
		// between UiccSlot, UiccCard, EuiccCard, UiccPort, EuiccPort and UiccProfile for now.
		protected final Object mLock;
		private final CloseGuard mCloseGuard = CloseGuard.get();

		private String mIccid;
		protected String mCardId;
		@@ -68,6 +71,7 @@ public class UiccPort {
		if (DBG) log("Creating");
		mPhoneId = phoneId;
		mLock = lock;
		mCloseGuard.open("cleanup");
		update(c, ci, ics, uiccCard);
		}

		@@ -97,6 +101,7 @@ public class UiccPort {
		public void dispose() {
		synchronized (mLock) {
		if (DBG) log("Disposing Port");
		mCloseGuard.close();
		if (mUiccProfile != null) {
		mUiccProfile.dispose();
		}
		@@ -106,9 +111,14 @@ public class UiccPort {
		}

		@Override
		protected void finalize() {
		protected void finalize() throws Throwable {
		if (DBG) log("UiccPort finalized");
		try {
		if (mCloseGuard != null) mCloseGuard.warnIfOpen();
		cleanupOpenLogicalChannelRecordsIfNeeded();
		} finally {
		super.finalize();
		}
		}

		/**