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

Commit 33db6c5e authored by Roopa Sattiraju's avatar Roopa Sattiraju Committed by Android (Google) Code Review
Browse files

Merge "Adding SystemApi for remaining Telephony errors"

parents 39071378 1b5c45c7

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -42943,6 +42943,7 @@ package android.telephony { 
    field public static final int ENCODING_16BIT = 3; // 0x3

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

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

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

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

    field public static final String FORMAT_3GPP = "3gpp";

    field public static final String FORMAT_3GPP2 = "3gpp2";

telephony/java/android/telephony/SmsMessage.java

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ public class SmsMessage { 
    public static final int ENCODING_8BIT = 2;

    public static final int ENCODING_16BIT = 3;

    /**

     * @hide This value is not defined in global standard. Only in Korea, this is used.

     * This value is not defined in global standard. Only in Korea, this is used.

     */

    public static final int ENCODING_KSC5601 = 4;