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

Commit efb9f496 authored by Thomas Nguyen's avatar Thomas Nguyen
Browse files

Add more RIL error codes to SmsManager#Result 

Bug: 250951137
Test: manual
Doc: go/enhance-sms-error-handling

Change-Id: I7f041fff9a1c0d41ad5d0b87f40f6cdbca8fd5e6
parent 42319e3c

core/api/current.txt

+13 −0
Original line number Diff line number Diff line
@@ -43409,14 +43409,18 @@ package android.telephony { 
    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_REQUEST_NOT_SUPPORTED = 24; // 0x18

    field public static final int RESULT_RIL_ABORTED = 137; // 0x89

    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_DEVICE_IN_USE = 136; // 0x88

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

    field public static final int RESULT_RIL_GENERIC_ERROR = 124; // 0x7c

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

    field public static final int RESULT_RIL_INVALID_ARGUMENTS = 104; // 0x68

    field public static final int RESULT_RIL_INVALID_MODEM_STATE = 115; // 0x73

    field public static final int RESULT_RIL_INVALID_RESPONSE = 125; // 0x7d

    field public static final int RESULT_RIL_INVALID_SIM_STATE = 130; // 0x82

    field public static final int RESULT_RIL_INVALID_SMSC_ADDRESS = 110; // 0x6e

    field public static final int RESULT_RIL_INVALID_SMS_FORMAT = 107; // 0x6b

    field public static final int RESULT_RIL_INVALID_STATE = 103; // 0x67
@@ -43425,14 +43429,23 @@ package android.telephony { 
    field public static final int RESULT_RIL_NETWORK_NOT_READY = 116; // 0x74

    field public static final int RESULT_RIL_NETWORK_REJECT = 102; // 0x66

    field public static final int RESULT_RIL_NO_MEMORY = 105; // 0x69

    field public static final int RESULT_RIL_NO_NETWORK_FOUND = 135; // 0x87

    field public static final int RESULT_RIL_NO_RESOURCES = 118; // 0x76

    field public static final int RESULT_RIL_NO_SMS_TO_ACK = 131; // 0x83

    field public static final int RESULT_RIL_NO_SUBSCRIPTION = 134; // 0x86

    field public static final int RESULT_RIL_OPERATION_NOT_ALLOWED = 117; // 0x75

    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_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_BUSY = 132; // 0x84

    field public static final int RESULT_RIL_SIM_ERROR = 129; // 0x81

    field public static final int RESULT_RIL_SIM_FULL = 133; // 0x85

    field public static final int RESULT_RIL_SIM_PIN2 = 126; // 0x7e

    field public static final int RESULT_RIL_SIM_PUK2 = 127; // 0x7f

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

    field public static final int RESULT_RIL_SUBSCRIPTION_NOT_AVAILABLE = 128; // 0x80

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

    field public static final int RESULT_SMS_BLOCKED_DURING_EMERGENCY = 29; // 0x1d

    field public static final int RESULT_SMS_SEND_RETRY_FAILED = 30; // 0x1e

telephony/java/android/telephony/SmsManager.java

+83 −2
Original line number Diff line number Diff line
@@ -2268,7 +2268,21 @@ public final class SmsManager { 
            RESULT_RIL_SIM_ABSENT,

            RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED,

            RESULT_RIL_ACCESS_BARRED,

            RESULT_RIL_BLOCKED_DUE_TO_CALL

            RESULT_RIL_BLOCKED_DUE_TO_CALL,

            RESULT_RIL_GENERIC_ERROR,

            RESULT_RIL_INVALID_RESPONSE,

            RESULT_RIL_SIM_PIN2,

            RESULT_RIL_SIM_PUK2,

            RESULT_RIL_SUBSCRIPTION_NOT_AVAILABLE,

            RESULT_RIL_SIM_ERROR,

            RESULT_RIL_INVALID_SIM_STATE,

            RESULT_RIL_NO_SMS_TO_ACK,

            RESULT_RIL_SIM_BUSY,

            RESULT_RIL_SIM_FULL,

            RESULT_RIL_NO_SUBSCRIPTION,

            RESULT_RIL_NO_NETWORK_FOUND,

            RESULT_RIL_DEVICE_IN_USE,

            RESULT_RIL_ABORTED

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface Result {}
@@ -2534,7 +2548,7 @@ public final class SmsManager { 
    public static final int RESULT_RIL_SIM_ABSENT = 120;



    /**

     * 1X voice and SMS are not allowed simulteneously.

     * 1X voice and SMS are not allowed simultaneously.

     */

    public static final int RESULT_RIL_SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED = 121;
@@ -2553,6 +2567,73 @@ public final class SmsManager { 
     */

    public static final int RESULT_RIL_GENERIC_ERROR = 124;



    /**

     * A RIL internal error when one of the RIL layers receives an unrecognized response from a

     * lower layer.

     */

    public static final int RESULT_RIL_INVALID_RESPONSE = 125;



    /**

     * Operation requires SIM PIN2 to be entered

     */

    public static final int RESULT_RIL_SIM_PIN2 = 126;



    /**

     * Operation requires SIM PUK2 to be entered

     */

    public static final int RESULT_RIL_SIM_PUK2 = 127;



    /**

     * Fail to find CDMA subscription from specified location

     */

    public static final int RESULT_RIL_SUBSCRIPTION_NOT_AVAILABLE = 128;



    /**

     * Received error from SIM card

     */

    public static final int RESULT_RIL_SIM_ERROR = 129;



    /**

     * Cannot process the request in current SIM state

     */

    public static final int RESULT_RIL_INVALID_SIM_STATE = 130;



    /**

     * ACK received when there is no SMS to ack

     */

    public static final int RESULT_RIL_NO_SMS_TO_ACK = 131;



    /**

     * SIM is busy

     */

    public static final int RESULT_RIL_SIM_BUSY = 132;



    /**

     * The target EF is full

     */

    public static final int RESULT_RIL_SIM_FULL = 133;



    /**

     * Device does not have subscription

     */

    public static final int RESULT_RIL_NO_SUBSCRIPTION = 134;



    /**

     * Network cannot be found

     */

    public static final int RESULT_RIL_NO_NETWORK_FOUND = 135;



    /**

     * Operation cannot be performed because the device is currently in use

     */

    public static final int RESULT_RIL_DEVICE_IN_USE = 136;



    /**

     * Operation aborted

     */

    public static final int RESULT_RIL_ABORTED = 137;





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



    /**