Merge "Amend SMS over IMS proto and metrics collection" am: cb4372a9c8 (c18d7f53) · Commits · e / os / android_frameworks_opt_telephony

proto/src/telephony.proto

+7 −16

Original line number	Diff line number	Diff line
		@@ -578,11 +578,11 @@ enum ImsServiceErrno {
		IMS_E_UNKNOWN = 0;
		// The operation has succeeded
		IMS_E_SUCCESS = 1;
		// Sending an SMS over IMS has failed. Do not retry over IMS again or fallback to CS.
		// Sending SMS over IMS failed. Do not retry over IMS again or fallback to CS.
		IMS_E_SMS_SEND_STATUS_ERROR = 2;
		// Sending an SMS over IMS has failed. Retry over IMS again.
		// Sending SMS over IMS failed. Retry over IMS again.
		IMS_E_SMS_SEND_STATUS_ERROR_RETRY = 3;
		// Sending an SMS over IMS has failed. Fallback to sending the SMS over CS.
		// Sending SMS over IMS failed. Fallback to sending the SMS over CS.
		IMS_E_SMS_SEND_STATUS_ERROR_FALLBACK = 4;
		}

		@@ -1389,16 +1389,6 @@ message SmsSession {

		// CB message received
		CB_SMS_RECEIVED = 9;

		// Send an SMS message over ImsService
		SMS_SEND_IMS_SERVICE = 10;

		// Receive an SMS message result over ImsService
		SMS_SEND_RESULT_IMS_SERVICE = 11;

		// Receive an SMS message over ImsService
		SMS_RECEIVED_IMS_SERVICE = 12;

		}

		// Formats used to encode SMS messages
		@@ -1504,8 +1494,9 @@ message SmsSession {

		// See 3GPP 27.005, 3.2.5 for GSM/UMTS,
		// 3GPP2 N.S0005 (IS-41C) Table 171 for CDMA,
		// or ImsService for IMS specific error codes (using ImsService specific Event.Type)
		// -1 if unknown or not applicable
		// Will map to a SmsManager.RESULT_* code if ims_error is populated
		// SmsManager can be accessed from
		// frameworks/base/telephony/java/android/telephony/SmsManager.java
		optional int32 error_code = 10;

		// RIL error code
		@@ -1518,7 +1509,7 @@ message SmsSession {
		optional CBMessage cell_broadcast_message = 13;

		// ImsService error code.
		optional ImsServiceErrno imsError = 14;
		optional ImsServiceErrno ims_error = 14;
		}

		// Time when session has started, in minutes since epoch,

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

+8 −3

Original line number	Diff line number	Diff line
		@@ -179,7 +179,7 @@ public class ImsSmsDispatcher extends SMSDispatcher {
		int mappedResult;
		switch (result) {
		case Intents.RESULT_SMS_HANDLED:
		mappedResult = ImsSmsImplBase.STATUS_REPORT_STATUS_OK;
		mappedResult = ImsSmsImplBase.DELIVER_STATUS_OK;
		break;
		case Intents.RESULT_SMS_OUT_OF_MEMORY:
		mappedResult = ImsSmsImplBase.DELIVER_STATUS_ERROR_NO_MEMORY;
		@@ -199,11 +199,13 @@ public class ImsSmsDispatcher extends SMSDispatcher {
		Rlog.w(TAG, "SMS Received with a PDU that could not be parsed.");
		getImsManager().acknowledgeSms(token, 0, mappedResult);
		}
		mMetrics.writeImsServiceNewSms(mPhone.getPhoneId(), format, mappedResult);
		} catch (ImsException e) {
		Rlog.e(TAG, "Failed to acknowledgeSms(). Error: " + e.getMessage());
		mMetrics.writeImsServiceNewSms(mPhone.getPhoneId(), format,
		ImsSmsImplBase.DELIVER_STATUS_ERROR_GENERIC);
		}
		}, true);
		mMetrics.writeImsServiceNewSms(mPhone.getPhoneId(), format);
		}
		};

		@@ -366,10 +368,13 @@ public class ImsSmsDispatcher extends SMSDispatcher {
		smsc != null ? new String(smsc) : null,
		isRetry,
		pdu);
		mMetrics.writeImsServiceSendSms(mPhone.getPhoneId(), format);
		mMetrics.writeImsServiceSendSms(mPhone.getPhoneId(), format,
		ImsSmsImplBase.SEND_STATUS_OK);
		} catch (ImsException e) {
		Rlog.e(TAG, "sendSms failed. Falling back to PSTN. Error: " + e.getMessage());
		fallbackToPstn(token, tracker);
		mMetrics.writeImsServiceSendSms(mPhone.getPhoneId(), format,
		ImsSmsImplBase.SEND_STATUS_ERROR_FALLBACK);
		}
		}

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

+46 −6

Original line number	Diff line number	Diff line
		@@ -423,6 +423,19 @@ public class TelephonyMetrics {
		pw.print(event.delay);
		pw.print(" T=");
		pw.println(smsSessionEventToString(event.type));
		// Only show more info for tx/rx sms
		if (event.type == SmsSession.Event.Type.SMS_SEND
		\|\| event.type == SmsSession.Event.Type.SMS_RECEIVED
		\|\| event.type == SmsSession.Event.Type.SMS_SEND_RESULT) {
		pw.print(" ReqId=");
		pw.println(event.rilRequestId);
		pw.print(" E=");
		pw.println(event.errorCode);
		pw.print(" RilE=");
		pw.println(event.error);
		pw.print(" ImsE=");
		pw.println(event.imsError);
		}
		}
		pw.decreaseIndent();
		}
		@@ -1489,7 +1502,7 @@ public class TelephonyMetrics {
		} else {

		smsSession.addEvent(new SmsSessionEventBuilder(
		SmsSession.Event.Type.SMS_SEND_RESULT_IMS_SERVICE)
		SmsSession.Event.Type.SMS_SEND_RESULT)
		.setImsServiceErrno(resultCode)
		.setErrorCode(errorReason)
		);
		@@ -1790,8 +1803,11 @@ public class TelephonyMetrics {
		* @param phoneId Phone id
		* @param format SMS format. Either {@link SmsMessage#FORMAT_3GPP} or
		* {@link SmsMessage#FORMAT_3GPP2}.
		* @param resultCode The result of sending the new SMS to the vendor layer to be sent to the
		* carrier network.
		*/
		public synchronized void writeImsServiceSendSms(int phoneId, String format) {
		public synchronized void writeImsServiceSendSms(int phoneId, String format,
		@ImsSmsImplBase.SendStatusResult int resultCode) {
		InProgressSmsSession smsSession = startNewSmsSessionIfNeeded(phoneId);
		int formatCode = SmsSession.Event.Format.SMS_FORMAT_UNKNOWN;
		switch (format) {
		@@ -1804,8 +1820,9 @@ public class TelephonyMetrics {
		break;
		}
		}
		smsSession.addEvent(new SmsSessionEventBuilder(SmsSession.Event.Type.SMS_SEND_IMS_SERVICE)
		smsSession.addEvent(new SmsSessionEventBuilder(SmsSession.Event.Type.SMS_SEND)
		.setTech(SmsSession.Event.Tech.SMS_IMS)
		.setImsServiceErrno(resultCode)
		.setFormat(formatCode)
		);

		@@ -1836,8 +1853,10 @@ public class TelephonyMetrics {
		* @param phoneId Phone id
		* @param format SMS format. Either {@link SmsMessage#FORMAT_3GPP} or
		* {@link SmsMessage#FORMAT_3GPP2}.
		* @param result The result of processing the the newly received SMS message.
		*/
		public synchronized void writeImsServiceNewSms(int phoneId, String format) {
		public synchronized void writeImsServiceNewSms(int phoneId, String format,
		@ImsSmsImplBase.DeliverStatusResult int result) {
		InProgressSmsSession smsSession = startNewSmsSessionIfNeeded(phoneId);
		int formatCode = SmsSession.Event.Format.SMS_FORMAT_UNKNOWN;
		switch (format) {
		@@ -1850,10 +1869,31 @@ public class TelephonyMetrics {
		break;
		}
		}
		int smsError = SmsManager.RESULT_ERROR_GENERIC_FAILURE;
		switch (result) {
		case ImsSmsImplBase.DELIVER_STATUS_OK: {
		smsError = SmsManager.RESULT_ERROR_NONE;
		break;
		}
		case ImsSmsImplBase.DELIVER_STATUS_ERROR_NO_MEMORY: {
		smsError = SmsManager.RESULT_NO_MEMORY;
		break;
		}
		case ImsSmsImplBase.DELIVER_STATUS_ERROR_REQUEST_NOT_SUPPORTED: {
		smsError = SmsManager.RESULT_REQUEST_NOT_SUPPORTED;
		break;
		}
		case ImsSmsImplBase.DELIVER_STATUS_ERROR_GENERIC: {
		smsError = SmsManager.RESULT_ERROR_GENERIC_FAILURE;
		break;
		}
		}
		smsSession.addEvent(new SmsSessionEventBuilder(
		SmsSession.Event.Type.SMS_RECEIVED_IMS_SERVICE)
		SmsSession.Event.Type.SMS_RECEIVED)
		.setTech(SmsSession.Event.Tech.SMS_IMS)
		.setFormat(formatCode)
		.setErrorCode(smsError)
		.setImsServiceErrno(TelephonyProto.ImsServiceErrno.IMS_E_SUCCESS)
		);

		finishSmsSessionIfNeeded(smsSession);