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

Commit ea337540 authored by Allen Su's avatar Allen Su Committed by Gerrit Code Review
Browse files

Merge "Declare new SMS error code in SmsManager"

parents 6bf6e05d a2c5de50

core/api/current.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -46213,6 +46213,8 @@ package android.telephony { 
    field public static final int RESULT_RECEIVE_WHILE_ENCRYPTED = 504; // 0x1f8

    field public static final int RESULT_RECEIVE_WHILE_ENCRYPTED = 504; // 0x1f8

    field public static final int RESULT_REMOTE_EXCEPTION = 31; // 0x1f

    field public static final int RESULT_REMOTE_EXCEPTION = 31; // 0x1f

    field public static final int RESULT_REQUEST_NOT_SUPPORTED = 24; // 0x18

    field public static final int RESULT_REQUEST_NOT_SUPPORTED = 24; // 0x18

    field public static final int RESULT_RIL_ACCESS_BARRED = 122; // 0x7a

    field public static final int RESULT_RIL_BLOCKED_DUE_TO_CALL = 123; // 0x7b

    field public static final int RESULT_RIL_CANCELLED = 119; // 0x77

    field public static final int RESULT_RIL_CANCELLED = 119; // 0x77

    field public static final int RESULT_RIL_ENCODING_ERR = 109; // 0x6d

    field public static final int RESULT_RIL_ENCODING_ERR = 109; // 0x6d

    field public static final int RESULT_RIL_INTERNAL_ERR = 113; // 0x71

    field public static final int RESULT_RIL_INTERNAL_ERR = 113; // 0x71
@@ -46231,6 +46233,7 @@ package android.telephony { 
    field public static final int RESULT_RIL_RADIO_NOT_AVAILABLE = 100; // 0x64

    field public static final int RESULT_RIL_RADIO_NOT_AVAILABLE = 100; // 0x64

    field public static final int RESULT_RIL_REQUEST_NOT_SUPPORTED = 114; // 0x72

    field public static final int RESULT_RIL_REQUEST_NOT_SUPPORTED = 114; // 0x72

    field public static final int RESULT_RIL_REQUEST_RATE_LIMITED = 106; // 0x6a

    field public static final int RESULT_RIL_REQUEST_RATE_LIMITED = 106; // 0x6a

    field public static final int RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED = 121; // 0x79

    field public static final int RESULT_RIL_SIM_ABSENT = 120; // 0x78

    field public static final int RESULT_RIL_SIM_ABSENT = 120; // 0x78

    field public static final int RESULT_RIL_SMS_SEND_FAIL_RETRY = 101; // 0x65

    field public static final int RESULT_RIL_SMS_SEND_FAIL_RETRY = 101; // 0x65

    field public static final int RESULT_RIL_SYSTEM_ERR = 108; // 0x6c

    field public static final int RESULT_RIL_SYSTEM_ERR = 108; // 0x6c

telephony/java/android/telephony/SmsManager.java

+34 −1
Original line number Original line Diff line number Diff line
@@ -408,6 +408,9 @@ public final class SmsManager { 
     *  <code>RESULT_RIL_NO_RESOURCES</code><br>

     *  <code>RESULT_RIL_NO_RESOURCES</code><br>

     *  <code>RESULT_RIL_CANCELLED</code><br>

     *  <code>RESULT_RIL_CANCELLED</code><br>

     *  <code>RESULT_RIL_SIM_ABSENT</code><br>

     *  <code>RESULT_RIL_SIM_ABSENT</code><br>

     *  <code>RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED</code><br>

     *  <code>RESULT_RIL_ACCESS_BARRED</code><br>

     *  <code>RESULT_RIL_BLOCKED_DUE_TO_CALL</code><br>

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

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

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

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

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

     *  value, generally only useful for troubleshooting.<br>
@@ -520,6 +523,9 @@ public final class SmsManager { 
     *  <code>RESULT_RIL_NO_RESOURCES</code><br>

     *  <code>RESULT_RIL_NO_RESOURCES</code><br>

     *  <code>RESULT_RIL_CANCELLED</code><br>

     *  <code>RESULT_RIL_CANCELLED</code><br>

     *  <code>RESULT_RIL_SIM_ABSENT</code><br>

     *  <code>RESULT_RIL_SIM_ABSENT</code><br>

     *  <code>RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED</code><br>

     *  <code>RESULT_RIL_ACCESS_BARRED</code><br>

     *  <code>RESULT_RIL_BLOCKED_DUE_TO_CALL</code><br>

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

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

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

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

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

     *  value, generally only useful for troubleshooting.<br>
@@ -921,6 +927,9 @@ public final class SmsManager { 
     *  <code>RESULT_RIL_NO_RESOURCES</code><br>

     *  <code>RESULT_RIL_NO_RESOURCES</code><br>

     *  <code>RESULT_RIL_CANCELLED</code><br>

     *  <code>RESULT_RIL_CANCELLED</code><br>

     *  <code>RESULT_RIL_SIM_ABSENT</code><br>

     *  <code>RESULT_RIL_SIM_ABSENT</code><br>

     *  <code>RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED</code><br>

     *  <code>RESULT_RIL_ACCESS_BARRED</code><br>

     *  <code>RESULT_RIL_BLOCKED_DUE_TO_CALL</code><br>

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

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

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

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

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

     *  value, generally only useful for troubleshooting.<br>
@@ -1179,6 +1188,9 @@ public final class SmsManager { 
     *  <code>RESULT_RIL_NO_RESOURCES</code><br>

     *  <code>RESULT_RIL_NO_RESOURCES</code><br>

     *  <code>RESULT_RIL_CANCELLED</code><br>

     *  <code>RESULT_RIL_CANCELLED</code><br>

     *  <code>RESULT_RIL_SIM_ABSENT</code><br>

     *  <code>RESULT_RIL_SIM_ABSENT</code><br>

     *  <code>RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED</code><br>

     *  <code>RESULT_RIL_ACCESS_BARRED</code><br>

     *  <code>RESULT_RIL_BLOCKED_DUE_TO_CALL</code><br>

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

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

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

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

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

     *  value, generally only useful for troubleshooting.<br>
@@ -1378,6 +1390,9 @@ public final class SmsManager { 
     *  <code>RESULT_RIL_NO_RESOURCES</code><br>

     *  <code>RESULT_RIL_NO_RESOURCES</code><br>

     *  <code>RESULT_RIL_CANCELLED</code><br>

     *  <code>RESULT_RIL_CANCELLED</code><br>

     *  <code>RESULT_RIL_SIM_ABSENT</code><br>

     *  <code>RESULT_RIL_SIM_ABSENT</code><br>

     *  <code>RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED</code><br>

     *  <code>RESULT_RIL_ACCESS_BARRED</code><br>

     *  <code>RESULT_RIL_BLOCKED_DUE_TO_CALL</code><br>

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

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

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

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

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

     *  value, generally only useful for troubleshooting.<br>
@@ -2208,7 +2223,10 @@ public final class SmsManager { 
            RESULT_RIL_OPERATION_NOT_ALLOWED,

            RESULT_RIL_OPERATION_NOT_ALLOWED,

            RESULT_RIL_NO_RESOURCES,

            RESULT_RIL_NO_RESOURCES,

            RESULT_RIL_CANCELLED,

            RESULT_RIL_CANCELLED,

            RESULT_RIL_SIM_ABSENT

            RESULT_RIL_SIM_ABSENT,

            RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED,

            RESULT_RIL_ACCESS_BARRED,

            RESULT_RIL_BLOCKED_DUE_TO_CALL

    })

    })

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    public @interface Result {}

    public @interface Result {}
@@ -2473,6 +2491,21 @@ public final class SmsManager { 
     */

     */

    public static final int RESULT_RIL_SIM_ABSENT = 120;

    public static final int RESULT_RIL_SIM_ABSENT = 120;





    /**

     * 1X voice and SMS are not allowed simulteneously.

     */

    public static final int RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED = 121;



    /**

     * Access is barred.

     */

    public static final int RESULT_RIL_ACCESS_BARRED = 122;



    /**

     * SMS is blocked due to call control, e.g., resource unavailable in the SMR entity.

     */

    public static final int RESULT_RIL_BLOCKED_DUE_TO_CALL = 123;



    // SMS receiving results sent as a "result" extra in {@link Intents.SMS_REJECTED_ACTION}

    // SMS receiving results sent as a "result" extra in {@link Intents.SMS_REJECTED_ACTION}





    /**

    /**