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

Commit aebc91af authored by Jesse Melhuish's avatar Jesse Melhuish Committed by Android (Google) Code Review
Browse files

Merge "Clean up temporary_failures_in_carrier_messaging_service" into main

parents 1f703aa0 a28b6158

core/api/current.txt

+43 −43
Original line number Diff line number Diff line
@@ -41885,18 +41885,18 @@ package android.service.carrier { 
    method @Deprecated public void onSendTextSms(@NonNull String, int, @NonNull String, @NonNull android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);

    method public void onSendTextSms(@NonNull String, int, @NonNull String, int, @NonNull android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);

    field public static final int DOWNLOAD_STATUS_ERROR = 2; // 0x2

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int DOWNLOAD_STATUS_MMS_ERROR_CONFIGURATION_ERROR = 606; // 0x25e

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int DOWNLOAD_STATUS_MMS_ERROR_DATA_DISABLED = 610; // 0x262

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int DOWNLOAD_STATUS_MMS_ERROR_HTTP_FAILURE = 603; // 0x25b

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int DOWNLOAD_STATUS_MMS_ERROR_INACTIVE_SUBSCRIPTION = 609; // 0x261

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int DOWNLOAD_STATUS_MMS_ERROR_INVALID_APN = 601; // 0x259

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int DOWNLOAD_STATUS_MMS_ERROR_INVALID_SUBSCRIPTION_ID = 608; // 0x260

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int DOWNLOAD_STATUS_MMS_ERROR_IO_ERROR = 604; // 0x25c

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int DOWNLOAD_STATUS_MMS_ERROR_MMS_DISABLED_BY_CARRIER = 611; // 0x263

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int DOWNLOAD_STATUS_MMS_ERROR_NO_DATA_NETWORK = 607; // 0x25f

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int DOWNLOAD_STATUS_MMS_ERROR_RETRY = 605; // 0x25d

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int DOWNLOAD_STATUS_MMS_ERROR_UNABLE_CONNECT_MMS = 602; // 0x25a

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int DOWNLOAD_STATUS_MMS_ERROR_UNSPECIFIED = 600; // 0x258

    field public static final int DOWNLOAD_STATUS_MMS_ERROR_CONFIGURATION_ERROR = 606; // 0x25e

    field public static final int DOWNLOAD_STATUS_MMS_ERROR_DATA_DISABLED = 610; // 0x262

    field public static final int DOWNLOAD_STATUS_MMS_ERROR_HTTP_FAILURE = 603; // 0x25b

    field public static final int DOWNLOAD_STATUS_MMS_ERROR_INACTIVE_SUBSCRIPTION = 609; // 0x261

    field public static final int DOWNLOAD_STATUS_MMS_ERROR_INVALID_APN = 601; // 0x259

    field public static final int DOWNLOAD_STATUS_MMS_ERROR_INVALID_SUBSCRIPTION_ID = 608; // 0x260

    field public static final int DOWNLOAD_STATUS_MMS_ERROR_IO_ERROR = 604; // 0x25c

    field public static final int DOWNLOAD_STATUS_MMS_ERROR_MMS_DISABLED_BY_CARRIER = 611; // 0x263

    field public static final int DOWNLOAD_STATUS_MMS_ERROR_NO_DATA_NETWORK = 607; // 0x25f

    field public static final int DOWNLOAD_STATUS_MMS_ERROR_RETRY = 605; // 0x25d

    field public static final int DOWNLOAD_STATUS_MMS_ERROR_UNABLE_CONNECT_MMS = 602; // 0x25a

    field public static final int DOWNLOAD_STATUS_MMS_ERROR_UNSPECIFIED = 600; // 0x258

    field public static final int DOWNLOAD_STATUS_OK = 0; // 0x0

    field public static final int DOWNLOAD_STATUS_RETRY_ON_CARRIER_NETWORK = 1; // 0x1

    field public static final int RECEIVE_OPTIONS_DEFAULT = 0; // 0x0
@@ -41904,38 +41904,38 @@ package android.service.carrier { 
    field public static final int RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_PROTECTED_STORAGE_UNAVAILABLE = 2; // 0x2

    field public static final int SEND_FLAG_REQUEST_DELIVERY_STATUS = 1; // 0x1

    field public static final int SEND_STATUS_ERROR = 2; // 0x2

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_MMS_ERROR_CONFIGURATION_ERROR = 406; // 0x196

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_MMS_ERROR_DATA_DISABLED = 410; // 0x19a

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_MMS_ERROR_HTTP_FAILURE = 403; // 0x193

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_MMS_ERROR_INACTIVE_SUBSCRIPTION = 409; // 0x199

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_MMS_ERROR_INVALID_APN = 401; // 0x191

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_MMS_ERROR_INVALID_SUBSCRIPTION_ID = 408; // 0x198

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_MMS_ERROR_IO_ERROR = 404; // 0x194

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_MMS_ERROR_MMS_DISABLED_BY_CARRIER = 411; // 0x19b

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_MMS_ERROR_NO_DATA_NETWORK = 407; // 0x197

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_MMS_ERROR_RETRY = 405; // 0x195

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_MMS_ERROR_UNABLE_CONNECT_MMS = 402; // 0x192

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_MMS_ERROR_UNSPECIFIED = 400; // 0x190

    field public static final int SEND_STATUS_MMS_ERROR_CONFIGURATION_ERROR = 406; // 0x196

    field public static final int SEND_STATUS_MMS_ERROR_DATA_DISABLED = 410; // 0x19a

    field public static final int SEND_STATUS_MMS_ERROR_HTTP_FAILURE = 403; // 0x193

    field public static final int SEND_STATUS_MMS_ERROR_INACTIVE_SUBSCRIPTION = 409; // 0x199

    field public static final int SEND_STATUS_MMS_ERROR_INVALID_APN = 401; // 0x191

    field public static final int SEND_STATUS_MMS_ERROR_INVALID_SUBSCRIPTION_ID = 408; // 0x198

    field public static final int SEND_STATUS_MMS_ERROR_IO_ERROR = 404; // 0x194

    field public static final int SEND_STATUS_MMS_ERROR_MMS_DISABLED_BY_CARRIER = 411; // 0x19b

    field public static final int SEND_STATUS_MMS_ERROR_NO_DATA_NETWORK = 407; // 0x197

    field public static final int SEND_STATUS_MMS_ERROR_RETRY = 405; // 0x195

    field public static final int SEND_STATUS_MMS_ERROR_UNABLE_CONNECT_MMS = 402; // 0x192

    field public static final int SEND_STATUS_MMS_ERROR_UNSPECIFIED = 400; // 0x190

    field public static final int SEND_STATUS_OK = 0; // 0x0

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_CANCELLED = 215; // 0xd7

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_ENCODING_ERROR = 212; // 0xd4

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_ERROR_FDN_CHECK_FAILURE = 204; // 0xcc

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_ERROR_GENERIC_FAILURE = 200; // 0xc8

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_ERROR_LIMIT_EXCEEDED = 203; // 0xcb

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_ERROR_NO_SERVICE = 202; // 0xca

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_ERROR_NULL_PDU = 201; // 0xc9

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED = 206; // 0xce

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_ERROR_SHORT_CODE_NOT_ALLOWED = 205; // 0xcd

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_INVALID_ARGUMENTS = 208; // 0xd0

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_INVALID_SMSC_ADDRESS = 213; // 0xd5

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_INVALID_SMS_FORMAT = 210; // 0xd2

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_INVALID_STATE = 209; // 0xd1

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_NETWORK_ERROR = 211; // 0xd3

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_NETWORK_REJECT = 207; // 0xcf

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_OPERATION_NOT_ALLOWED = 214; // 0xd6

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_REQUEST_NOT_SUPPORTED = 216; // 0xd8

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_SMS_BLOCKED_DURING_EMERGENCY = 217; // 0xd9

    field @FlaggedApi("com.android.internal.telephony.flags.temporary_failures_in_carrier_messaging_service") public static final int SEND_STATUS_RESULT_SMS_SEND_RETRY_FAILED = 218; // 0xda

    field public static final int SEND_STATUS_RESULT_CANCELLED = 215; // 0xd7

    field public static final int SEND_STATUS_RESULT_ENCODING_ERROR = 212; // 0xd4

    field public static final int SEND_STATUS_RESULT_ERROR_FDN_CHECK_FAILURE = 204; // 0xcc

    field public static final int SEND_STATUS_RESULT_ERROR_GENERIC_FAILURE = 200; // 0xc8

    field public static final int SEND_STATUS_RESULT_ERROR_LIMIT_EXCEEDED = 203; // 0xcb

    field public static final int SEND_STATUS_RESULT_ERROR_NO_SERVICE = 202; // 0xca

    field public static final int SEND_STATUS_RESULT_ERROR_NULL_PDU = 201; // 0xc9

    field public static final int SEND_STATUS_RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED = 206; // 0xce

    field public static final int SEND_STATUS_RESULT_ERROR_SHORT_CODE_NOT_ALLOWED = 205; // 0xcd

    field public static final int SEND_STATUS_RESULT_INVALID_ARGUMENTS = 208; // 0xd0

    field public static final int SEND_STATUS_RESULT_INVALID_SMSC_ADDRESS = 213; // 0xd5

    field public static final int SEND_STATUS_RESULT_INVALID_SMS_FORMAT = 210; // 0xd2

    field public static final int SEND_STATUS_RESULT_INVALID_STATE = 209; // 0xd1

    field public static final int SEND_STATUS_RESULT_NETWORK_ERROR = 211; // 0xd3

    field public static final int SEND_STATUS_RESULT_NETWORK_REJECT = 207; // 0xcf

    field public static final int SEND_STATUS_RESULT_OPERATION_NOT_ALLOWED = 214; // 0xd6

    field public static final int SEND_STATUS_RESULT_REQUEST_NOT_SUPPORTED = 216; // 0xd8

    field public static final int SEND_STATUS_RESULT_SMS_BLOCKED_DURING_EMERGENCY = 217; // 0xd9

    field public static final int SEND_STATUS_RESULT_SMS_SEND_RETRY_FAILED = 218; // 0xda

    field public static final int SEND_STATUS_RETRY_ON_CARRIER_NETWORK = 1; // 0x1

    field public static final String SERVICE_INTERFACE = "android.service.carrier.CarrierMessagingService";

  }

core/java/android/service/carrier/CarrierMessagingService.java

+0 −46
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.service.carrier;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -27,8 +26,6 @@ import android.net.Uri; 
import android.os.IBinder;

import android.os.RemoteException;



import com.android.internal.telephony.flags.Flags;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.List;
@@ -121,7 +118,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_ERROR_GENERIC_FAILURE

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_ERROR_GENERIC_FAILURE = 200;



    /**
@@ -129,7 +125,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_ERROR_NULL_PDU

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_ERROR_NULL_PDU = 201;



    /**
@@ -137,7 +132,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_ERROR_NO_SERVICE

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_ERROR_NO_SERVICE = 202;



    /**
@@ -145,7 +139,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_ERROR_LIMIT_EXCEEDED

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_ERROR_LIMIT_EXCEEDED = 203;



    /**
@@ -153,7 +146,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_ERROR_FDN_CHECK_FAILURE

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_ERROR_FDN_CHECK_FAILURE = 204;



    /**
@@ -161,7 +153,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_ERROR_SHORT_CODE_NOT_ALLOWED

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_ERROR_SHORT_CODE_NOT_ALLOWED = 205;



    /**
@@ -169,7 +160,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED = 206;



    /**
@@ -177,7 +167,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_NETWORK_REJECT

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_NETWORK_REJECT = 207;



    /**
@@ -185,7 +174,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_INVALID_ARGUMENTS

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_INVALID_ARGUMENTS = 208;



    /**
@@ -193,7 +181,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_INVALID_STATE

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_INVALID_STATE = 209;



    /**
@@ -201,7 +188,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_INVALID_SMS_FORMAT

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_INVALID_SMS_FORMAT = 210;



    /**
@@ -209,7 +195,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_NETWORK_ERROR

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_NETWORK_ERROR = 211;



    /**
@@ -217,7 +202,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_ENCODING_ERROR

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_ENCODING_ERROR = 212;



    /**
@@ -225,7 +209,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_INVALID_SMSC_ADDRESS

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_INVALID_SMSC_ADDRESS = 213;



    /**
@@ -233,7 +216,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_OPERATION_NOT_ALLOWED

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_OPERATION_NOT_ALLOWED = 214;



    /**
@@ -241,7 +223,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_CANCELLED

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_CANCELLED = 215;



    /**
@@ -249,7 +230,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_REQUEST_NOT_SUPPORTED

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_REQUEST_NOT_SUPPORTED = 216;



    /**
@@ -257,7 +237,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_SMS_BLOCKED_DURING_EMERGENCY

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_SMS_BLOCKED_DURING_EMERGENCY = 217;



    /**
@@ -265,7 +244,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.RESULT_SMS_SEND_RETRY_FAILED

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_RESULT_SMS_SEND_RETRY_FAILED = 218;



    /**
@@ -281,7 +259,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_UNSPECIFIED

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_MMS_ERROR_UNSPECIFIED = 400;



    /**
@@ -289,7 +266,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_INVALID_APN

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_MMS_ERROR_INVALID_APN = 401;



    /**
@@ -297,7 +273,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_UNABLE_CONNECT_MMS

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_MMS_ERROR_UNABLE_CONNECT_MMS = 402;



    /**
@@ -305,7 +280,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_HTTP_FAILURE

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_MMS_ERROR_HTTP_FAILURE = 403;



    /**
@@ -313,7 +287,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_IO_ERROR

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_MMS_ERROR_IO_ERROR = 404;



    /**
@@ -321,7 +294,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_RETRY

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_MMS_ERROR_RETRY = 405;



    /**
@@ -329,7 +301,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_CONFIGURATION_ERROR

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_MMS_ERROR_CONFIGURATION_ERROR = 406;



    /**
@@ -337,7 +308,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_NO_DATA_NETWORK

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_MMS_ERROR_NO_DATA_NETWORK = 407;



    /**
@@ -345,7 +315,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_INVALID_SUBSCRIPTION_ID

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_MMS_ERROR_INVALID_SUBSCRIPTION_ID = 408;



    /**
@@ -353,7 +322,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_INACTIVE_SUBSCRIPTION

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_MMS_ERROR_INACTIVE_SUBSCRIPTION = 409;



    /**
@@ -361,7 +329,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_DATA_DISABLED

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_MMS_ERROR_DATA_DISABLED = 410;



    /**
@@ -369,7 +336,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_MMS_DISABLED_BY_CARRIER

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int SEND_STATUS_MMS_ERROR_MMS_DISABLED_BY_CARRIER = 411;



    /** @hide */
@@ -446,7 +412,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_UNSPECIFIED

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int DOWNLOAD_STATUS_MMS_ERROR_UNSPECIFIED = 600;



    /**
@@ -454,7 +419,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_INVALID_APN

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int DOWNLOAD_STATUS_MMS_ERROR_INVALID_APN = 601;



    /**
@@ -462,7 +426,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_UNABLE_CONNECT_MMS

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int DOWNLOAD_STATUS_MMS_ERROR_UNABLE_CONNECT_MMS = 602;



    /**
@@ -470,7 +433,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_HTTP_FAILURE

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int DOWNLOAD_STATUS_MMS_ERROR_HTTP_FAILURE = 603;



    /**
@@ -478,7 +440,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_IO_ERROR

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int DOWNLOAD_STATUS_MMS_ERROR_IO_ERROR = 604;



    /**
@@ -486,7 +447,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_RETRY

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int DOWNLOAD_STATUS_MMS_ERROR_RETRY = 605;



    /**
@@ -494,7 +454,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_CONFIGURATION_ERROR

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int DOWNLOAD_STATUS_MMS_ERROR_CONFIGURATION_ERROR = 606;



    /**
@@ -502,7 +461,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_NO_DATA_NETWORK

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int DOWNLOAD_STATUS_MMS_ERROR_NO_DATA_NETWORK = 607;



    /**
@@ -510,7 +468,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_INVALID_SUBSCRIPTION_ID

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int DOWNLOAD_STATUS_MMS_ERROR_INVALID_SUBSCRIPTION_ID = 608;



    /**
@@ -518,7 +475,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_INACTIVE_SUBSCRIPTION

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int DOWNLOAD_STATUS_MMS_ERROR_INACTIVE_SUBSCRIPTION = 609;



    /**
@@ -526,7 +482,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_DATA_DISABLED

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int DOWNLOAD_STATUS_MMS_ERROR_DATA_DISABLED = 610;



    /**
@@ -534,7 +489,6 @@ public abstract class CarrierMessagingService extends Service { 
     *

     * @see android.telephony.SmsManager.MMS_ERROR_MMS_DISABLED_BY_CARRIER

     */

    @FlaggedApi(Flags.FLAG_TEMPORARY_FAILURES_IN_CARRIER_MESSAGING_SERVICE)

    public static final int DOWNLOAD_STATUS_MMS_ERROR_MMS_DISABLED_BY_CARRIER = 611;



    /** @hide */