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

Commit ca1917f6 authored by Allen Su's avatar Allen Su Committed by Automerger Merge Worker
Browse files

Merge "Declare new SMS error code in SmsManager" am: ea337540 am: b670c621... 

Merge "Declare new SMS error code in SmsManager" am: ea337540 am: b670c621 am: 9973c5bb am: ce022bad

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495901

Change-Id: Iffe8f936bf8217782b645e95c51200ec50d13391
parents f5ccd5fa ce022bad

core/api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -46595,6 +46595,8 @@ 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_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_ENCODING_ERR = 109; // 0x6d

    field public static final int RESULT_RIL_INTERNAL_ERR = 113; // 0x71
@@ -46613,6 +46615,7 @@ package android.telephony { 
    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_SMS_SEND_FAIL_RETRY = 101; // 0x65

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

telephony/java/android/telephony/SmsManager.java

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

     *  <code>RESULT_RIL_CANCELLED</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,

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

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

     *  <code>RESULT_RIL_CANCELLED</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,

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

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

     *  <code>RESULT_RIL_CANCELLED</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,

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

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

     *  <code>RESULT_RIL_CANCELLED</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,

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

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

     *  <code>RESULT_RIL_CANCELLED</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,

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

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

            RESULT_RIL_NO_RESOURCES,

            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)

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

    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}



    /**