Snap for 13473899 from a7475f650675981ab37c502669ab6acfee44dcc0 to 25Q3-release (f4758382) · Commits · e / os / android_frameworks_opt_telephony

flags/calling.aconfig

+0 −8

Original line number	Diff line number	Diff line
		@@ -10,14 +10,6 @@ flag {
		is_exported: true
		}

		# OWNER=yomna TARGET=24Q3
		flag {
		name: "show_call_fail_notification_for_2g_toggle"
		namespace: "telephony"
		description: "Used in DisconnectCause and TelephonyConnection if a non-emergency call fails on a device with no 2G, to guard whether a user can see an updated error message reminding the 2G is disabled and potentially disrupting their call connectivity"
		bug: "300142897"
		}

		# OWNER=stevestatia TARGET=24Q4
		flag {
		name: "national_country_code_formatting_for_local_calls"

proto/src/persist_atoms.proto

+1 −0

Original line number	Diff line number	Diff line
		@@ -353,6 +353,7 @@ message IncomingSms {
		optional bool is_ntn = 17;
		optional bool is_emergency = 18;
		optional bool is_nb_iot_ntn = 19;
		optional int32 pdu_length = 20;

		// Internal use only
		optional int32 hashCode = 10001;

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

+25 −5

Original line number	Diff line number	Diff line
		@@ -779,7 +779,7 @@ public abstract class InboundSmsHandler extends StateMachine {
		if (result != Intents.RESULT_SMS_HANDLED && result != Activity.RESULT_OK) {
		mMetrics.writeIncomingSmsError(mPhone.getPhoneId(), is3gpp2(), smsSource, result);
		mPhone.getSmsStats().onIncomingSmsError(is3gpp2(), smsSource, result,
		isEmergencyNumber(smsb.getOriginatingAddress()));
		isEmergencyNumber(smsb.getOriginatingAddress()), 0);
		if (mPhone != null) {
		TelephonyAnalytics telephonyAnalytics = mPhone.getTelephonyAnalytics();
		if (telephonyAnalytics != null) {
		@@ -1054,7 +1054,7 @@ public abstract class InboundSmsHandler extends StateMachine {
		logeWithLocalLog(errorMsg, tracker.getMessageId());
		mPhone.getSmsStats().onIncomingSmsError(
		is3gpp2(), tracker.getSource(), RESULT_SMS_NULL_PDU,
		isEmergencyNumber(tracker.getAddress()));
		isEmergencyNumber(tracker.getAddress()), 0);
		if (mPhone != null) {
		TelephonyAnalytics telephonyAnalytics = mPhone.getTelephonyAnalytics();
		if (telephonyAnalytics != null) {
		@@ -1084,7 +1084,7 @@ public abstract class InboundSmsHandler extends StateMachine {
		tracker.getMessageId());
		mPhone.getSmsStats().onIncomingSmsWapPush(tracker.getSource(),
		messageCount, RESULT_SMS_NULL_MESSAGE, tracker.getMessageId(),
		isEmergencyNumber(tracker.getAddress()));
		isEmergencyNumber(tracker.getAddress()), 0);
		return false;
		}
		}
		@@ -1116,10 +1116,12 @@ public abstract class InboundSmsHandler extends StateMachine {
		// needs to be ignored, so treating it as a success case.
		boolean wapPushResult =
		result == Activity.RESULT_OK \|\| result == Intents.RESULT_SMS_HANDLED;
		int pduLength = wapPushResult ? output.size() : 0;
		mMetrics.writeIncomingWapPush(mPhone.getPhoneId(), tracker.getSource(),
		format, timestamps, wapPushResult, tracker.getMessageId());
		mPhone.getSmsStats().onIncomingSmsWapPush(tracker.getSource(), messageCount,
		result, tracker.getMessageId(), isEmergencyNumber(tracker.getAddress()));
		result, tracker.getMessageId(), isEmergencyNumber(tracker.getAddress()),
		pduLength);
		// result is Activity.RESULT_OK if an ordered broadcast was sent
		if (result == Activity.RESULT_OK) {
		return true;
		@@ -1140,7 +1142,7 @@ public abstract class InboundSmsHandler extends StateMachine {
		format, timestamps, block, tracker.getMessageId());
		mPhone.getSmsStats().onIncomingSmsSuccess(is3gpp2(), tracker.getSource(),
		messageCount, block, tracker.getMessageId(),
		isEmergencyNumber(tracker.getAddress()));
		isEmergencyNumber(tracker.getAddress()), getTotalPduLength(pdus));
		CarrierRoamingSatelliteSessionStats sessionStats =
		CarrierRoamingSatelliteSessionStats.getInstance(mPhone.getSubId());
		sessionStats.onIncomingSms(mPhone.getSubId());
		@@ -2015,6 +2017,24 @@ public abstract class InboundSmsHandler extends StateMachine {
		& RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_PROTECTED_STORAGE_UNAVAILABLE) > 0;
		}

		/** Determines pdu length in bytes from the given SmsMessageBase. */
		public static int getPduLength(SmsMessageBase sms) {
		byte[] pduBytes = sms != null ? sms.getPdu() : null;
		return (pduBytes != null) ? pduBytes.length : 0;
		}

		private int getTotalPduLength(byte[][] pdus) {
		int totalPduLength = 0;
		if (pdus != null) {
		for (byte[] p : pdus) {
		if (p != null) {
		totalPduLength += p.length;
		}
		}
		}
		return totalPduLength;
		}

		/**
		* Log with debug level in logcat and LocalLog
		* @param logMsg msg to log

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -122,7 +122,6 @@ public abstract class SMSDispatcher extends Handler {
		protected static final String MAP_KEY_DEST_PORT = "destPort";
		protected static final String MAP_KEY_DATA = "data";
		protected static final String MAP_KEY_TEXT = "text";

		private static final int PREMIUM_RULE_USE_SIM = 1;
		private static final int PREMIUM_RULE_USE_NETWORK = 2;
		private static final int PREMIUM_RULE_USE_BOTH = 3;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -275,7 +275,7 @@ public class SmsBroadcastUndelivered {
		if (phone != null) {
		phone.getSmsStats().onDroppedIncomingMultipartSms(message.mIs3gpp2, rows,
		message.mMessageCount, TelephonyManager.from(context)
		.isEmergencyNumber(message.mAddress));
		.isEmergencyNumber(message.mAddress), 0);
		TelephonyAnalytics telephonyAnalytics = phone.getTelephonyAnalytics();
		if (telephonyAnalytics != null) {
		SmsMmsAnalytics smsMmsAnalytics =