Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 747871c1 authored by Amit Mahajan's avatar Amit Mahajan Committed by Gerrit Code Review
Browse files

Merge "Cleanup for new result codes"

parents 2fa15e91 e4d11de9

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

+280 −71

File changed.

Preview size limit exceeded, changes collapsed.

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

+192 −31
Original line number Diff line number Diff line
@@ -605,13 +605,65 @@ public class SmsDispatchersController extends Handler { 
     *  broadcast when the message is successfully sent, or failed.

     *  The result code will be <code>Activity.RESULT_OK<code> for success,

     *  or one of these errors:<br>

     *  <code>RESULT_ERROR_GENERIC_FAILURE</code><br>

     *  <code>RESULT_ERROR_RADIO_OFF</code><br>

     *  <code>RESULT_ERROR_NULL_PDU</code><br>

     *  <code>RESULT_ERROR_NO_SERVICE</code><br>.

     *  For <code>RESULT_ERROR_GENERIC_FAILURE</code> the sentIntent may include

     *  the extra "errorCode" containing a radio technology specific value,

     *  generally only useful for troubleshooting.<br>

     *  <code>SmsManager.RESULT_ERROR_GENERIC_FAILURE</code><br>

     *  <code>SmsManager.RESULT_ERROR_RADIO_OFF</code><br>

     *  <code>SmsManager.RESULT_ERROR_NULL_PDU</code><br>

     *  <code>SmsManager.RESULT_ERROR_NO_SERVICE</code><br>

     *  <code>SmsManager.RESULT_ERROR_LIMIT_EXCEEDED</code><br>

     *  <code>SmsManager.RESULT_ERROR_FDN_CHECK_FAILURE</code><br>

     *  <code>SmsManager.RESULT_ERROR_SHORT_CODE_NOT_ALLOWED</code><br>

     *  <code>SmsManager.RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED</code><br>

     *  <code>SmsManager.RESULT_RADIO_NOT_AVAILABLE</code><br>

     *  <code>SmsManager.RESULT_NETWORK_REJECT</code><br>

     *  <code>SmsManager.RESULT_INVALID_ARGUMENTS</code><br>

     *  <code>SmsManager.RESULT_INVALID_STATE</code><br>

     *  <code>SmsManager.RESULT_NO_MEMORY</code><br>

     *  <code>SmsManager.RESULT_INVALID_SMS_FORMAT</code><br>

     *  <code>SmsManager.RESULT_SYSTEM_ERROR</code><br>

     *  <code>SmsManager.RESULT_MODEM_ERROR</code><br>

     *  <code>SmsManager.RESULT_NETWORK_ERROR</code><br>

     *  <code>SmsManager.RESULT_ENCODING_ERROR</code><br>

     *  <code>SmsManager.RESULT_INVALID_SMSC_ADDRESS</code><br>

     *  <code>SmsManager.RESULT_OPERATION_NOT_ALLOWED</code><br>

     *  <code>SmsManager.RESULT_INTERNAL_ERROR</code><br>

     *  <code>SmsManager.RESULT_NO_RESOURCES</code><br>

     *  <code>SmsManager.RESULT_CANCELLED</code><br>

     *  <code>SmsManager.RESULT_REQUEST_NOT_SUPPORTED</code><br>

     *  <code>SmsManager.RESULT_NO_BLUETOOTH_SERVICE</code><br>

     *  <code>SmsManager.RESULT_INVALID_BLUETOOTH_ADDRESS</code><br>

     *  <code>SmsManager.RESULT_BLUETOOTH_DISCONNECTED</code><br>

     *  <code>SmsManager.RESULT_UNEXPECTED_EVENT_STOP_SENDING</code><br>

     *  <code>SmsManager.RESULT_SMS_BLOCKED_DURING_EMERGENCY</code><br>

     *  <code>SmsManager.RESULT_SMS_SEND_RETRY_FAILED</code><br>

     *  <code>SmsManager.RESULT_REMOTE_EXCEPTION</code><br>

     *  <code>SmsManager.RESULT_NO_DEFAULT_SMS_APP</code><br>

     *  <code>SmsManager.RESULT_RIL_RADIO_NOT_AVAILABLE</code><br>

     *  <code>SmsManager.RESULT_RIL_SMS_SEND_FAIL_RETRY</code><br>

     *  <code>SmsManager.RESULT_RIL_NETWORK_REJECT</code><br>

     *  <code>SmsManager.RESULT_RIL_INVALID_STATE</code><br>

     *  <code>SmsManager.RESULT_RIL_INVALID_ARGUMENTS</code><br>

     *  <code>SmsManager.RESULT_RIL_NO_MEMORY</code><br>

     *  <code>SmsManager.RESULT_RIL_REQUEST_RATE_LIMITED</code><br>

     *  <code>SmsManager.RESULT_RIL_INVALID_SMS_FORMAT</code><br>

     *  <code>SmsManager.RESULT_RIL_SYSTEM_ERR</code><br>

     *  <code>SmsManager.RESULT_RIL_ENCODING_ERR</code><br>

     *  <code>SmsManager.RESULT_RIL_INVALID_SMSC_ADDRESS</code><br>

     *  <code>SmsManager.RESULT_RIL_MODEM_ERR</code><br>

     *  <code>SmsManager.RESULT_RIL_NETWORK_ERR</code><br>

     *  <code>SmsManager.RESULT_RIL_INTERNAL_ERR</code><br>

     *  <code>SmsManager.RESULT_RIL_REQUEST_NOT_SUPPORTED</code><br>

     *  <code>SmsManager.RESULT_RIL_INVALID_MODEM_STATE</code><br>

     *  <code>SmsManager.RESULT_RIL_NETWORK_NOT_READY</code><br>

     *  <code>SmsManager.RESULT_RIL_OPERATION_NOT_ALLOWED</code><br>

     *  <code>SmsManager.RESULT_RIL_NO_RESOURCES</code><br>

     *  <code>SmsManager.RESULT_RIL_CANCELLED</code><br>

     *  <code>SmsManager.RESULT_RIL_SIM_ABSENT</code><br>

     *  <code>SmsManager.RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED</code><br>

     *  <code>SmsManager.RESULT_RIL_ACCESS_BARRED</code><br>

     *  <code>SmsManager.RESULT_RIL_BLOCKED_DUE_TO_CALL</code><br>

     *  For <code>SmsManager.RESULT_ERROR_GENERIC_FAILURE</code> or any of the RESULT_RIL errors,

     *  the sentIntent may include the extra "errorCode" containing a radio technology specific

     *  value, generally only useful for troubleshooting.<br>

     *  The per-application based SMS control checks sentIntent. If sentIntent

     *  is NULL the caller will be checked against all unknown applications,

     *  which cause smaller number of SMS to be sent in checking period.
@@ -635,6 +687,7 @@ public class SmsDispatchersController extends Handler { 


    /**

     * Send a text based SMS.

     *

     * @param destAddr the address to send the message to

     * @param scAddr is the service center address or null to use

     *  the current default SMSC
@@ -643,13 +696,65 @@ public class SmsDispatchersController extends Handler { 
     *  broadcast when the message is successfully sent, or failed.

     *  The result code will be <code>Activity.RESULT_OK<code> for success,

     *  or one of these errors:<br>

     *  <code>RESULT_ERROR_GENERIC_FAILURE</code><br>

     *  <code>RESULT_ERROR_RADIO_OFF</code><br>

     *  <code>RESULT_ERROR_NULL_PDU</code><br>

     *  <code>RESULT_ERROR_NO_SERVICE</code><br>.

     *  For <code>RESULT_ERROR_GENERIC_FAILURE</code> the sentIntent may include

     *  the extra "errorCode" containing a radio technology specific value,

     *  generally only useful for troubleshooting.<br>

     *  <code>SmsManager.RESULT_ERROR_GENERIC_FAILURE</code><br>

     *  <code>SmsManager.RESULT_ERROR_RADIO_OFF</code><br>

     *  <code>SmsManager.RESULT_ERROR_NULL_PDU</code><br>

     *  <code>SmsManager.RESULT_ERROR_NO_SERVICE</code><br>

     *  <code>SmsManager.RESULT_ERROR_LIMIT_EXCEEDED</code><br>

     *  <code>SmsManager.RESULT_ERROR_FDN_CHECK_FAILURE</code><br>

     *  <code>SmsManager.RESULT_ERROR_SHORT_CODE_NOT_ALLOWED</code><br>

     *  <code>SmsManager.RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED</code><br>

     *  <code>SmsManager.RESULT_RADIO_NOT_AVAILABLE</code><br>

     *  <code>SmsManager.RESULT_NETWORK_REJECT</code><br>

     *  <code>SmsManager.RESULT_INVALID_ARGUMENTS</code><br>

     *  <code>SmsManager.RESULT_INVALID_STATE</code><br>

     *  <code>SmsManager.RESULT_NO_MEMORY</code><br>

     *  <code>SmsManager.RESULT_INVALID_SMS_FORMAT</code><br>

     *  <code>SmsManager.RESULT_SYSTEM_ERROR</code><br>

     *  <code>SmsManager.RESULT_MODEM_ERROR</code><br>

     *  <code>SmsManager.RESULT_NETWORK_ERROR</code><br>

     *  <code>SmsManager.RESULT_ENCODING_ERROR</code><br>

     *  <code>SmsManager.RESULT_INVALID_SMSC_ADDRESS</code><br>

     *  <code>SmsManager.RESULT_OPERATION_NOT_ALLOWED</code><br>

     *  <code>SmsManager.RESULT_INTERNAL_ERROR</code><br>

     *  <code>SmsManager.RESULT_NO_RESOURCES</code><br>

     *  <code>SmsManager.RESULT_CANCELLED</code><br>

     *  <code>SmsManager.RESULT_REQUEST_NOT_SUPPORTED</code><br>

     *  <code>SmsManager.RESULT_NO_BLUETOOTH_SERVICE</code><br>

     *  <code>SmsManager.RESULT_INVALID_BLUETOOTH_ADDRESS</code><br>

     *  <code>SmsManager.RESULT_BLUETOOTH_DISCONNECTED</code><br>

     *  <code>SmsManager.RESULT_UNEXPECTED_EVENT_STOP_SENDING</code><br>

     *  <code>SmsManager.RESULT_SMS_BLOCKED_DURING_EMERGENCY</code><br>

     *  <code>SmsManager.RESULT_SMS_SEND_RETRY_FAILED</code><br>

     *  <code>SmsManager.RESULT_REMOTE_EXCEPTION</code><br>

     *  <code>SmsManager.RESULT_NO_DEFAULT_SMS_APP</code><br>

     *  <code>SmsManager.RESULT_RIL_RADIO_NOT_AVAILABLE</code><br>

     *  <code>SmsManager.RESULT_RIL_SMS_SEND_FAIL_RETRY</code><br>

     *  <code>SmsManager.RESULT_RIL_NETWORK_REJECT</code><br>

     *  <code>SmsManager.RESULT_RIL_INVALID_STATE</code><br>

     *  <code>SmsManager.RESULT_RIL_INVALID_ARGUMENTS</code><br>

     *  <code>SmsManager.RESULT_RIL_NO_MEMORY</code><br>

     *  <code>SmsManager.RESULT_RIL_REQUEST_RATE_LIMITED</code><br>

     *  <code>SmsManager.RESULT_RIL_INVALID_SMS_FORMAT</code><br>

     *  <code>SmsManager.RESULT_RIL_SYSTEM_ERR</code><br>

     *  <code>SmsManager.RESULT_RIL_ENCODING_ERR</code><br>

     *  <code>SmsManager.RESULT_RIL_INVALID_SMSC_ADDRESS</code><br>

     *  <code>SmsManager.RESULT_RIL_MODEM_ERR</code><br>

     *  <code>SmsManager.RESULT_RIL_NETWORK_ERR</code><br>

     *  <code>SmsManager.RESULT_RIL_INTERNAL_ERR</code><br>

     *  <code>SmsManager.RESULT_RIL_REQUEST_NOT_SUPPORTED</code><br>

     *  <code>SmsManager.RESULT_RIL_INVALID_MODEM_STATE</code><br>

     *  <code>SmsManager.RESULT_RIL_NETWORK_NOT_READY</code><br>

     *  <code>SmsManager.RESULT_RIL_OPERATION_NOT_ALLOWED</code><br>

     *  <code>SmsManager.RESULT_RIL_NO_RESOURCES</code><br>

     *  <code>SmsManager.RESULT_RIL_CANCELLED</code><br>

     *  <code>SmsManager.RESULT_RIL_SIM_ABSENT</code><br>

     *  <code>SmsManager.RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED</code><br>

     *  <code>SmsManager.RESULT_RIL_ACCESS_BARRED</code><br>

     *  <code>SmsManager.RESULT_RIL_BLOCKED_DUE_TO_CALL</code><br>

     *  For <code>SmsManager.RESULT_ERROR_GENERIC_FAILURE</code> or any of the RESULT_RIL errors,

     *  the sentIntent may include the extra "errorCode" containing a radio technology specific

     *  value, generally only useful for troubleshooting.<br>

     *  The per-application based SMS control checks sentIntent. If sentIntent

     *  is NULL the caller will be checked against all unknown applications,

     *  which cause smaller number of SMS to be sent in checking period.
@@ -701,6 +806,7 @@ public class SmsDispatchersController extends Handler { 


    /**

     * Send a multi-part text based SMS.

     *

     * @param destAddr the address to send the message to

     * @param scAddr is the service center address or null to use

     *  the current default SMSC
@@ -710,11 +816,66 @@ public class SmsDispatchersController extends Handler { 
     *  <code>PendingIntent</code>s (one for each message part) that is

     *  broadcast when the corresponding message part has been sent.

     *  The result code will be <code>Activity.RESULT_OK<code> for success,

     *   or one of these errors:

     *   <code>RESULT_ERROR_GENERIC_FAILURE</code>

     *   <code>RESULT_ERROR_RADIO_OFF</code>

     *   <code>RESULT_ERROR_NULL_PDU</code>

     *   <code>RESULT_ERROR_NO_SERVICE</code>.

     *  or one of these errors:<br>

     *  <code>SmsManager.RESULT_ERROR_GENERIC_FAILURE</code><br>

     *  <code>SmsManager.RESULT_ERROR_RADIO_OFF</code><br>

     *  <code>SmsManager.RESULT_ERROR_NULL_PDU</code><br>

     *  <code>SmsManager.RESULT_ERROR_NO_SERVICE</code><br>

     *  <code>SmsManager.RESULT_ERROR_LIMIT_EXCEEDED</code><br>

     *  <code>SmsManager.RESULT_ERROR_FDN_CHECK_FAILURE</code><br>

     *  <code>SmsManager.RESULT_ERROR_SHORT_CODE_NOT_ALLOWED</code><br>

     *  <code>SmsManager.RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED</code><br>

     *  <code>SmsManager.RESULT_RADIO_NOT_AVAILABLE</code><br>

     *  <code>SmsManager.RESULT_NETWORK_REJECT</code><br>

     *  <code>SmsManager.RESULT_INVALID_ARGUMENTS</code><br>

     *  <code>SmsManager.RESULT_INVALID_STATE</code><br>

     *  <code>SmsManager.RESULT_NO_MEMORY</code><br>

     *  <code>SmsManager.RESULT_INVALID_SMS_FORMAT</code><br>

     *  <code>SmsManager.RESULT_SYSTEM_ERROR</code><br>

     *  <code>SmsManager.RESULT_MODEM_ERROR</code><br>

     *  <code>SmsManager.RESULT_NETWORK_ERROR</code><br>

     *  <code>SmsManager.RESULT_ENCODING_ERROR</code><br>

     *  <code>SmsManager.RESULT_INVALID_SMSC_ADDRESS</code><br>

     *  <code>SmsManager.RESULT_OPERATION_NOT_ALLOWED</code><br>

     *  <code>SmsManager.RESULT_INTERNAL_ERROR</code><br>

     *  <code>SmsManager.RESULT_NO_RESOURCES</code><br>

     *  <code>SmsManager.RESULT_CANCELLED</code><br>

     *  <code>SmsManager.RESULT_REQUEST_NOT_SUPPORTED</code><br>

     *  <code>SmsManager.RESULT_NO_BLUETOOTH_SERVICE</code><br>

     *  <code>SmsManager.RESULT_INVALID_BLUETOOTH_ADDRESS</code><br>

     *  <code>SmsManager.RESULT_BLUETOOTH_DISCONNECTED</code><br>

     *  <code>SmsManager.RESULT_UNEXPECTED_EVENT_STOP_SENDING</code><br>

     *  <code>SmsManager.RESULT_SMS_BLOCKED_DURING_EMERGENCY</code><br>

     *  <code>SmsManager.RESULT_SMS_SEND_RETRY_FAILED</code><br>

     *  <code>SmsManager.RESULT_REMOTE_EXCEPTION</code><br>

     *  <code>SmsManager.RESULT_NO_DEFAULT_SMS_APP</code><br>

     *  <code>SmsManager.RESULT_RIL_RADIO_NOT_AVAILABLE</code><br>

     *  <code>SmsManager.RESULT_RIL_SMS_SEND_FAIL_RETRY</code><br>

     *  <code>SmsManager.RESULT_RIL_NETWORK_REJECT</code><br>

     *  <code>SmsManager.RESULT_RIL_INVALID_STATE</code><br>

     *  <code>SmsManager.RESULT_RIL_INVALID_ARGUMENTS</code><br>

     *  <code>SmsManager.RESULT_RIL_NO_MEMORY</code><br>

     *  <code>SmsManager.RESULT_RIL_REQUEST_RATE_LIMITED</code><br>

     *  <code>SmsManager.RESULT_RIL_INVALID_SMS_FORMAT</code><br>

     *  <code>SmsManager.RESULT_RIL_SYSTEM_ERR</code><br>

     *  <code>SmsManager.RESULT_RIL_ENCODING_ERR</code><br>

     *  <code>SmsManager.RESULT_RIL_INVALID_SMSC_ADDRESS</code><br>

     *  <code>SmsManager.RESULT_RIL_MODEM_ERR</code><br>

     *  <code>SmsManager.RESULT_RIL_NETWORK_ERR</code><br>

     *  <code>SmsManager.RESULT_RIL_INTERNAL_ERR</code><br>

     *  <code>SmsManager.RESULT_RIL_REQUEST_NOT_SUPPORTED</code><br>

     *  <code>SmsManager.RESULT_RIL_INVALID_MODEM_STATE</code><br>

     *  <code>SmsManager.RESULT_RIL_NETWORK_NOT_READY</code><br>

     *  <code>SmsManager.RESULT_RIL_OPERATION_NOT_ALLOWED</code><br>

     *  <code>SmsManager.RESULT_RIL_NO_RESOURCES</code><br>

     *  <code>SmsManager.RESULT_RIL_CANCELLED</code><br>

     *  <code>SmsManager.RESULT_RIL_SIM_ABSENT</code><br>

     *  <code>SmsManager.RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED</code><br>

     *  <code>SmsManager.RESULT_RIL_ACCESS_BARRED</code><br>

     *  <code>SmsManager.RESULT_RIL_BLOCKED_DUE_TO_CALL</code><br>

     *  For <code>SmsManager.RESULT_ERROR_GENERIC_FAILURE</code> or any of the RESULT_RIL errors,

     *  the sentIntent may include the extra "errorCode" containing a radio technology specific

     *  value, generally only useful for troubleshooting.<br>

     *  The per-application based SMS control checks sentIntent. If sentIntent

     *  is NULL the caller will be checked against all unknown applications,

     *  which cause smaller number of SMS to be sent in checking period.

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

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ import com.android.telephony.Rlog; 


import java.util.Random;



/** Collects voice call events per phone ID for the pulled atom. */

/** Collects sms events per phone ID for the pulled atom. */

public class SmsStats {

    private static final String TAG = SmsStats.class.getSimpleName();