Add isMtSmsPolling value to OutgoingSms Atom (3b4eab14) · Commits · e / os / android_frameworks_opt_telephony

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -248,7 +248,8 @@ public class ImsSmsDispatcher extends SMSDispatcher {
		tracker.mMessageId,
		tracker.isFromDefaultSmsApplication(mContext),
		tracker.getInterval(),
		mTelephonyManager.isEmergencyNumber(tracker.mDestAddress));
		mTelephonyManager.isEmergencyNumber(tracker.mDestAddress),
		tracker.isMtSmsPollingMessage(mContext));
		if (mPhone != null) {
		TelephonyAnalytics telephonyAnalytics = mPhone.getTelephonyAnalytics();
		if (telephonyAnalytics != null) {
		@@ -666,7 +667,8 @@ public class ImsSmsDispatcher extends SMSDispatcher {
		tracker.mMessageId,
		tracker.isFromDefaultSmsApplication(mContext),
		tracker.getInterval(),
		mTelephonyManager.isEmergencyNumber(tracker.mDestAddress));
		mTelephonyManager.isEmergencyNumber(tracker.mDestAddress),
		tracker.isMtSmsPollingMessage(mContext));
		if (mPhone != null) {
		TelephonyAnalytics telephonyAnalytics = mPhone.getTelephonyAnalytics();
		if (telephonyAnalytics != null) {

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

+10 −5

Original line number	Diff line number	Diff line
		@@ -1140,7 +1140,8 @@ public abstract class SMSDispatcher extends Handler {
		tracker.mMessageId,
		tracker.isFromDefaultSmsApplication(mContext),
		tracker.getInterval(),
		mTelephonyManager.isEmergencyNumber(tracker.mDestAddress));
		mTelephonyManager.isEmergencyNumber(tracker.mDestAddress),
		tracker.isMtSmsPollingMessage(mContext));
		if (mPhone != null) {
		TelephonyAnalytics telephonyAnalytics = mPhone.getTelephonyAnalytics();
		if (telephonyAnalytics != null) {
		@@ -1201,7 +1202,8 @@ public abstract class SMSDispatcher extends Handler {
		tracker.mMessageId,
		tracker.isFromDefaultSmsApplication(mContext),
		tracker.getInterval(),
		mTelephonyManager.isEmergencyNumber(tracker.mDestAddress));
		mTelephonyManager.isEmergencyNumber(tracker.mDestAddress),
		tracker.isMtSmsPollingMessage(mContext));
		if (mPhone != null) {
		TelephonyAnalytics telephonyAnalytics = mPhone.getTelephonyAnalytics();
		if (telephonyAnalytics != null) {
		@@ -1238,7 +1240,8 @@ public abstract class SMSDispatcher extends Handler {
		tracker.mMessageId,
		tracker.isFromDefaultSmsApplication(mContext),
		tracker.getInterval(),
		mTelephonyManager.isEmergencyNumber(tracker.mDestAddress));
		mTelephonyManager.isEmergencyNumber(tracker.mDestAddress),
		tracker.isMtSmsPollingMessage(mContext));
		if (mPhone != null) {
		TelephonyAnalytics telephonyAnalytics = mPhone.getTelephonyAnalytics();
		if (telephonyAnalytics != null) {
		@@ -1265,7 +1268,8 @@ public abstract class SMSDispatcher extends Handler {
		tracker.mMessageId,
		tracker.isFromDefaultSmsApplication(mContext),
		tracker.getInterval(),
		mTelephonyManager.isEmergencyNumber(tracker.mDestAddress));
		mTelephonyManager.isEmergencyNumber(tracker.mDestAddress),
		tracker.isMtSmsPollingMessage(mContext));
		if (mPhone != null) {
		TelephonyAnalytics telephonyAnalytics = mPhone.getTelephonyAnalytics();
		if (telephonyAnalytics != null) {
		@@ -2498,7 +2502,8 @@ public abstract class SMSDispatcher extends Handler {
		trackers[0].mMessageId,
		trackers[0].isFromDefaultSmsApplication(mContext),
		trackers[0].getInterval(),
		mTelephonyManager.isEmergencyNumber(trackers[0].mDestAddress));
		mTelephonyManager.isEmergencyNumber(trackers[0].mDestAddress),
		trackers[0].isMtSmsPollingMessage(mContext));
		if (mPhone != null) {
		TelephonyAnalytics telephonyAnalytics = mPhone.getTelephonyAnalytics();
		if (telephonyAnalytics != null) {

src/java/com/android/internal/telephony/metrics/MetricsCollector.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1197,7 +1197,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
		sms.networkErrorCode,
		sms.isManagedProfile,
		sms.isEmergency,
		sms.isNtn);
		sms.isNtn,
		sms.isMtSmsPolling);
		}

		private static StatsEvent buildStatsEvent(DataCallSession dataCallSession) {

src/java/com/android/internal/telephony/metrics/SmsStats.java

+8 −5

Original line number	Diff line number	Diff line
		@@ -160,18 +160,19 @@ public class SmsStats {
		/** Create a new atom when an outgoing SMS is sent. */
		public void onOutgoingSms(boolean isOverIms, boolean is3gpp2, boolean fallbackToCs,
		@SmsManager.Result int sendErrorCode, long messageId, boolean isFromDefaultApp,
		long intervalMillis, boolean isEmergency) {
		long intervalMillis, boolean isEmergency, boolean isMtSmsPolling) {
		onOutgoingSms(isOverIms, is3gpp2, fallbackToCs, sendErrorCode, NO_ERROR_CODE,
		messageId, isFromDefaultApp, intervalMillis, isEmergency);
		messageId, isFromDefaultApp, intervalMillis, isEmergency, isMtSmsPolling);
		}

		/** Create a new atom when an outgoing SMS is sent. */
		public void onOutgoingSms(boolean isOverIms, boolean is3gpp2, boolean fallbackToCs,
		@SmsManager.Result int sendErrorCode, int networkErrorCode, long messageId,
		boolean isFromDefaultApp, long intervalMillis, boolean isEmergency) {
		boolean isFromDefaultApp, long intervalMillis, boolean isEmergency,
		boolean isMtSmsPolling) {
		OutgoingSms proto =
		getOutgoingDefaultProto(is3gpp2, isOverIms, messageId, isFromDefaultApp,
		intervalMillis, isEmergency);
		intervalMillis, isEmergency, isMtSmsPolling);

		// The field errorCode is used for up-to-Android-13 devices. From Android 14, sendErrorCode
		// and networkErrorCode will be used. The field errorCode will be deprecated when most
		@@ -247,7 +248,8 @@ public class SmsStats {

		/** Create a proto for a normal {@code OutgoingSms} with default values. */
		private OutgoingSms getOutgoingDefaultProto(boolean is3gpp2, boolean isOverIms,
		long messageId, boolean isFromDefaultApp, long intervalMillis, boolean isEmergency) {
		long messageId, boolean isFromDefaultApp, long intervalMillis, boolean isEmergency,
		boolean isMtSmsPolling) {
		OutgoingSms proto = new OutgoingSms();
		proto.smsFormat = getSmsFormat(is3gpp2);
		proto.smsTech = getSmsTech(isOverIms, is3gpp2);
		@@ -270,6 +272,7 @@ public class SmsStats {
		proto.isManagedProfile = mPhone.isManagedProfile();
		proto.isEmergency = isEmergency;
		proto.isNtn = isNonTerrestrialNetwork();
		proto.isMtSmsPolling = isMtSmsPolling;
		return proto;
		}