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

Commit a43b3827 authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Add new error code in SmsManager" into oc-mr1-dev 

am: 1dafcc89

Change-Id: I938ddabfe0d98ee1eee850ba9d6aeb857ebb748f
parents b737076a 1dafcc89

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -40098,9 +40098,12 @@ package android.telephony { 
    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_ERROR_GENERIC_FAILURE = 1; // 0x1

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

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

+3 −0
Original line number Diff line number Diff line
@@ -43540,9 +43540,12 @@ package android.telephony { 
    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_ERROR_GENERIC_FAILURE = 1; // 0x1

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

    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 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/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -40357,9 +40357,12 @@ package android.telephony { 
    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_ERROR_GENERIC_FAILURE = 1; // 0x1

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

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

telephony/java/android/telephony/SmsManager.java

+5 −1
Original line number Diff line number Diff line
@@ -1131,10 +1131,14 @@ public final class SmsManager { 
    static public final int RESULT_ERROR_NULL_PDU           = 3;

    /** Failed because service is currently unavailable */

    static public final int RESULT_ERROR_NO_SERVICE         = 4;

    /** Failed because we reached the sending queue limit.  {@hide} */

    /** Failed because we reached the sending queue limit. */

    static public final int RESULT_ERROR_LIMIT_EXCEEDED     = 5;

    /** Failed because FDN is enabled. {@hide} */

    static public final int RESULT_ERROR_FDN_CHECK_FAILURE  = 6;

    /** Failed because user denied the sending of this short code. */

    static public final int RESULT_ERROR_SHORT_CODE_NOT_ALLOWED = 7;

    /** Failed because the user has denied this app ever send premium short codes. */

    static public final int RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED = 8;



    static private final String PHONE_PACKAGE_NAME = "com.android.phone";