Snap for 13374957 from 7ca3cdcd6e2713ead16076cede164ccee725d44e to 25Q3-release (6ee79e0e) · Commits · e / os / android_frameworks_opt_telephony

flags/satellite.aconfig

+11 −0

Original line number	Diff line number	Diff line
		@@ -115,3 +115,14 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		# OWNER=nagendranb TARGET=25Q3
		flag {
		name: "satellite_data_metrics"
		namespace: "telephony"
		description: "Support Satellite Data metrics at satellite session"
		bug: "405107194"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}
		No newline at end of file

proto/src/persist_atoms.proto

+10 −0

Original line number	Diff line number	Diff line
		@@ -840,6 +840,16 @@ message CarrierRoamingSatelliteSession {
		optional int64 satellite_data_consumed_bytes = 19;
		optional bool is_multi_sim = 20;
		optional bool is_nb_iot_ntn = 21;
		optional int32 count_of_data_connections = 22;
		repeated int32 last_fail_causes = 23;
		optional int32 count_of_data_disconnections = 24;
		optional int32 count_of_data_stalls = 25;
		optional int32 average_uplink_bandwidth_kbps = 26;
		optional int32 average_downlink_bandwidth_kbps = 27;
		optional int32 min_uplink_bandwidth_kbps = 28;
		optional int32 max_uplink_bandwidth_kbps = 29;
		optional int32 min_downlink_bandwidth_kbps = 30;
		optional int32 max_downlink_bandwidth_kbps = 31;
		}

		message CarrierRoamingSatelliteControllerStats {

src/java/com/android/internal/telephony/MccTable.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -336,8 +336,7 @@ public final class MccTable {
		public static final Map<Locale, Locale> FALLBACKS = new HashMap<Locale, Locale>();

		public static boolean isNewMccTableEnabled() {
		return com.android.icu.Flags.telephonyLookupMccExtension()
		&& com.android.internal.telephony.flags.Flags.useI18nForMccMapping();
		return com.android.internal.telephony.flags.Flags.useI18nForMccMapping();
		}

		static {

src/java/com/android/internal/telephony/SMSDispatcher.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -878,17 +878,32 @@ public abstract class SMSDispatcher extends Handler {
		Rlog.d(TAG, "processSendSmsResponse: Sending SMS by CarrierMessagingService failed."
		+ " Retry on carrier network. "
		+ SmsController.formatCrossStackMessageId(tracker.mMessageId));
		// Reset the result code from carrier messaging service so that result code from
		// RIL will be used.
		resetResultCodeFromCarrierMessagingService(tracker);
		sendSubmitPdu(tracker);
		break;
		default:
		Rlog.d(TAG, "processSendSmsResponse: Unknown result " + result + " Retry on carrier"
		+ " network. "
		+ SmsController.formatCrossStackMessageId(tracker.mMessageId));
		// Reset the result code from carrier messaging service so that result code from
		// RIL will be used.
		resetResultCodeFromCarrierMessagingService(tracker);
		sendSubmitPdu(tracker);
		}
		}

		private void resetResultCodeFromCarrierMessagingService(SmsTracker tracker) {
		if (Flags.temporaryFailuresInCarrierMessagingService()) {
		tracker.mResultCodeFromCarrierMessagingService =
		CarrierMessagingService.SEND_STATUS_OK;
		}
		}

		private int toSmsManagerResultForSendSms(int carrierMessagingServiceResult) {
		Rlog.d(TAG, "toSmsManagerResultForSendSms: carrierMessagingServiceResult="
		+ carrierMessagingServiceResult);
		switch (carrierMessagingServiceResult) {
		case CarrierMessagingService.SEND_STATUS_OK:
		return Activity.RESULT_OK;
		@@ -1295,6 +1310,7 @@ public abstract class SMSDispatcher extends Handler {
		@SmsManager.Result
		private int rilErrorToSmsManagerResult(CommandException.Error rilError,
		SmsTracker tracker) {
		Rlog.d(TAG, "rilErrorToSmsManagerResult: rilError=" + rilError + ", tracker=" + tracker);
		mSmsOutgoingErrorCodes.log("rilError: " + rilError
		+ ", MessageId: " + SmsController.formatCrossStackMessageId(tracker.mMessageId));

src/java/com/android/internal/telephony/data/DataNetwork.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -2365,6 +2365,7 @@ public class DataNetwork extends StateMachine {

		if (mIsSatellite && mDataConfigManager.getForcedCellularTransportCapabilities().stream()
		.noneMatch(this::hasNetworkCapabilityInNetworkRequests)) {
		logd("transport satellite is set");
		builder.addTransportType(NetworkCapabilities.TRANSPORT_SATELLITE);
		} else {
		builder.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);