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

Commit 08f5b2b7 authored by Hakjun Choi's avatar Hakjun Choi Committed by Android (Google) Code Review
Browse files

Merge "Add missed error case for sms metrics" into main

parents 0967f330 f54acdd6

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -47098,6 +47098,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 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

+8 −1
Original line number Diff line number Diff line
@@ -2442,7 +2442,8 @@ public final class SmsManager { 
            RESULT_RIL_NO_SUBSCRIPTION,

            RESULT_RIL_NO_NETWORK_FOUND,

            RESULT_RIL_DEVICE_IN_USE,

            RESULT_RIL_ABORTED

            RESULT_RIL_ABORTED,

            RESULT_SMS_SEND_FAIL_AFTER_MAX_RETRY

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface Result {}
@@ -2798,6 +2799,12 @@ public final class SmsManager { 
     */

    public static final int RESULT_RIL_ABORTED = 137;



    /**

     * SMS send failed due to exceeding max retry count

     */

    @FlaggedApi(Flags.FLAG_SATELLITE_25Q4_APIS)

    public static final int RESULT_SMS_SEND_FAIL_AFTER_MAX_RETRY = 138;





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