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

Commit fd32ff4c authored by Hakjun Choi's avatar Hakjun Choi
Browse files

Apply API council recommendation for existing API name and documentation 

1. Suggest rename to RESULT_SMS_SEND_FAILED_AFTER_MAX_RETRY to match naming of RESULT_SMS_SEND_RETRY_FAILED.
2. add additional javadoc to explain the difference between these two.

Bug: 418840544
Flag: com.android.internal.telephony.flags.satellite_25q4_apis
Test: build test
Change-Id: Id2fddc8d64d3acab834e5d55a7545276b4235f3b
parent 010b40c1

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -47111,7 +47111,7 @@ package android.telephony { 
    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 @FlaggedApi("com.android.internal.telephony.flags.satellite_25q4_apis") public static final int RESULT_SMS_SEND_FAIL_AFTER_MAX_RETRY = 138; // 0x8a

    field @FlaggedApi("com.android.internal.telephony.flags.satellite_25q4_apis") public static final int RESULT_SMS_SEND_FAILED_AFTER_MAX_RETRY = 138; // 0x8a

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

    field public static final int RESULT_SYSTEM_ERROR = 15; // 0xf

    field public static final int RESULT_UNEXPECTED_EVENT_STOP_SENDING = 28; // 0x1c

telephony/java/android/telephony/SmsManager.java

+9 −4
Original line number Diff line number Diff line
@@ -2443,7 +2443,7 @@ public final class SmsManager { 
            RESULT_RIL_NO_NETWORK_FOUND,

            RESULT_RIL_DEVICE_IN_USE,

            RESULT_RIL_ABORTED,

            RESULT_SMS_SEND_FAIL_AFTER_MAX_RETRY

            RESULT_SMS_SEND_FAILED_AFTER_MAX_RETRY

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface Result {}
@@ -2800,11 +2800,16 @@ public final class SmsManager { 
    public static final int RESULT_RIL_ABORTED = 137;



    /**

     * SMS send failed due to exceeding max retry count

     * Indicates that the SMS sending operation failed because all allowed retry attempts

     * were exhausted without successfully sending the message.

     * <p>

     * This is distinct from {@link #RESULT_SMS_SEND_RETRY_FAILED}, which signals a single failed

     * retry attempt where further retries might still be scheduled.

     * In contrast, {@code RESULT_SMS_SEND_FAILED_AFTER_MAX_RETRY} signifies that the maximum retry

     * limit has been surpassed, and no more attempts will be made for this SMS message.

     */

    @FlaggedApi(Flags.FLAG_SATELLITE_25Q4_APIS)

    public static final int RESULT_SMS_SEND_FAIL_AFTER_MAX_RETRY = 138;



    public static final int RESULT_SMS_SEND_FAILED_AFTER_MAX_RETRY = 138;



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