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

Commit c708cfe5 authored by Tom Taylor's avatar Tom Taylor Committed by Android (Google) Code Review
Browse files

Merge "Add new result codes"

parents e08dd1b6 f43f4f06

api/current.txt

+47 −0
Original line number Diff line number Diff line
@@ -44992,13 +44992,60 @@ package android.telephony { 
    field public static final int MMS_ERROR_RETRY = 6; // 0x6

    field public static final int MMS_ERROR_UNABLE_CONNECT_MMS = 3; // 0x3

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

    field public static final int RESULT_BLUETOOTH_DISCONNECTED = 27; // 0x1b

    field public static final int RESULT_CANCELLED = 23; // 0x17

    field public static final int RESULT_ENCODING_ERROR = 18; // 0x12

    field public static final int RESULT_ERROR_FDN_CHECK_FAILURE = 6; // 0x6

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

    field public static final int RESULT_ERROR_LIMIT_EXCEEDED = 5; // 0x5

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

    field public static final int RESULT_ERROR_NO_SERVICE = 4; // 0x4

    field public static final int RESULT_ERROR_NULL_PDU = 3; // 0x3

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

    field public static final int RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED = 8; // 0x8

    field public static final int RESULT_ERROR_SHORT_CODE_NOT_ALLOWED = 7; // 0x7

    field public static final int RESULT_INTERNAL_ERROR = 21; // 0x15

    field public static final int RESULT_INVALID_ARGUMENTS = 11; // 0xb

    field public static final int RESULT_INVALID_BLUETOOTH_ADDRESS = 26; // 0x1a

    field public static final int RESULT_INVALID_SMSC_ADDRESS = 19; // 0x13

    field public static final int RESULT_INVALID_SMS_FORMAT = 14; // 0xe

    field public static final int RESULT_INVALID_STATE = 12; // 0xc

    field public static final int RESULT_MODEM_ERROR = 16; // 0x10

    field public static final int RESULT_NETWORK_ERROR = 17; // 0x11

    field public static final int RESULT_NETWORK_REJECT = 10; // 0xa

    field public static final int RESULT_NO_BLUETOOTH_SERVICE = 25; // 0x19

    field public static final int RESULT_NO_DEFAULT_SMS_APP = 32; // 0x20

    field public static final int RESULT_NO_MEMORY = 13; // 0xd

    field public static final int RESULT_NO_RESOURCES = 22; // 0x16

    field public static final int RESULT_OPERATION_NOT_ALLOWED = 20; // 0x14

    field public static final int RESULT_RADIO_NOT_AVAILABLE = 9; // 0x9

    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_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

    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_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

    field public static final int RESULT_RIL_MODEM_ERR = 111; // 0x6f

    field public static final int RESULT_RIL_NETWORK_ERR = 112; // 0x70

    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_RESOURCES = 118; // 0x76

    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_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

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

    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

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

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

    field public static final int STATUS_ON_ICC_SENT = 5; // 0x5

api/system-current.txt

+0 −18
Original line number Diff line number Diff line
@@ -8230,24 +8230,6 @@ package android.telephony { 
    method public boolean disableCellBroadcastRange(int, int, int);

    method public boolean enableCellBroadcastRange(int, int, int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void sendMultipartTextMessageWithoutPersisting(String, String, java.util.List<java.lang.String>, java.util.List<android.app.PendingIntent>, java.util.List<android.app.PendingIntent>);

    field public static final int RESULT_CANCELLED = 23; // 0x17

    field public static final int RESULT_ENCODING_ERROR = 18; // 0x12

    field public static final int RESULT_ERROR_FDN_CHECK_FAILURE = 6; // 0x6

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

    field public static final int RESULT_INTERNAL_ERROR = 21; // 0x15

    field public static final int RESULT_INVALID_ARGUMENTS = 11; // 0xb

    field public static final int RESULT_INVALID_SMSC_ADDRESS = 19; // 0x13

    field public static final int RESULT_INVALID_SMS_FORMAT = 14; // 0xe

    field public static final int RESULT_INVALID_STATE = 12; // 0xc

    field public static final int RESULT_MODEM_ERROR = 16; // 0x10

    field public static final int RESULT_NETWORK_ERROR = 17; // 0x11

    field public static final int RESULT_NETWORK_REJECT = 10; // 0xa

    field public static final int RESULT_NO_MEMORY = 13; // 0xd

    field public static final int RESULT_NO_RESOURCES = 22; // 0x16

    field public static final int RESULT_OPERATION_NOT_ALLOWED = 20; // 0x14

    field public static final int RESULT_RADIO_NOT_AVAILABLE = 9; // 0x9

    field public static final int RESULT_REQUEST_NOT_SUPPORTED = 24; // 0x18

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

  }















  public class SubscriptionInfo implements android.os.Parcelable {

























telephony/java/android/telephony/SmsManager.java



+497
−149


























File changed.
Preview size limit exceeded, changes collapsed.