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

Commit 8e3dcbb5 authored by Cassie Han's avatar Cassie Han Committed by android-build-merger
Browse files

Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents." 

am: eb9452a0

Change-Id: Iaa4e291d0926db9ddb8123a7ec72acf1e82c4d84
parents 84af3a7b eb9452a0

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35724,6 +35724,7 @@ package android.provider { 
    field public static final int RESULT_SMS_HANDLED = 1; // 0x1

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

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

    field public static final java.lang.String SECRET_CODE_ACTION = "android.provider.Telephony.SECRET_CODE";

    field public static final java.lang.String SIM_FULL_ACTION = "android.provider.Telephony.SIM_FULL";

    field public static final java.lang.String SMS_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_CB_RECEIVED";

    field public static final java.lang.String SMS_DELIVER_ACTION = "android.provider.Telephony.SMS_DELIVER";

telephony/java/android/telephony/Telephony.java

+10 −0
Original line number Diff line number Diff line
@@ -1101,6 +1101,16 @@ public final class Telephony { 
            public static final String MMS_DOWNLOADED_ACTION =

                "android.provider.Telephony.MMS_DOWNLOADED";



            /**

             * Broadcast Action: A debug code has been entered in the dialer. These "secret codes"

             * are used to activate developer menus by dialing certain codes. And they are of the

             * form {@code *#*#<code>#*#*}. The intent will have the data URI:

             * {@code android_secret_code://<code>}.

             */

            @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

            public static final String SECRET_CODE_ACTION =

                    "android.provider.Telephony.SECRET_CODE";



            /**

             * Broadcast action: When the default SMS package changes,

             * the previous default SMS package and the new default SMS