commit a600b3120148ee36ac165aaad2fd089ebdee6e43
author Cassie Han <xih@google.com> Wed Jan 24 09:37:29 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 24 09:37:29 2018 +0000
tree 8f90d3707f56745e7f44e30389991662cbe43269
parent f96cb59c163607103e84b217e724e29057d1a3b7
parent b828fa2bfc1f31ab1f7282b09846cfa260e017cd

Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents." am: eb9452a08d am: 8e3dcbb5d3
am: b828fa2bfc

Change-Id: I086a958cab93dcbc47103e5d0c7d91dba5aab412

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 1848a8f93..b117d3e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -36484,6 +36484,7 @@
     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/provider/Telephony.java

diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java
index e633053..8c45724 100644
--- a/telephony/java/android/provider/Telephony.java
+++ b/telephony/java/android/provider/Telephony.java
@@ -1102,6 +1102,16 @@
                 "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
              * package are sent this broadcast to notify them of the change.