Merge "Updated intent action name to comply with CTS." into oc-dev

am: b4f21f0482

Change-Id: Ica8d3565560993dc100ccfb20adf8028f807d44f
This commit is contained in:
Sujith Ramakrishnan
2017-04-27 23:39:25 +00:00
committed by android-build-merger
2 changed files with 2 additions and 0 deletions

View File

@@ -9877,6 +9877,7 @@ package android.content {
field public static final java.lang.String ACTION_FACTORY_TEST = "android.intent.action.FACTORY_TEST";
field public static final java.lang.String ACTION_GET_CONTENT = "android.intent.action.GET_CONTENT";
field public static final java.lang.String ACTION_GET_RESTRICTION_ENTRIES = "android.intent.action.GET_RESTRICTION_ENTRIES";
field public static final java.lang.String ACTION_GLOBAL_BUTTON = "android.intent.action.GLOBAL_BUTTON";
field public static final java.lang.String ACTION_GTALK_SERVICE_CONNECTED = "android.intent.action.GTALK_CONNECTED";
field public static final java.lang.String ACTION_GTALK_SERVICE_DISCONNECTED = "android.intent.action.GTALK_DISCONNECTED";
field public static final java.lang.String ACTION_HEADSET_PLUG = "android.intent.action.HEADSET_PLUG";

View File

@@ -3228,6 +3228,7 @@ public class Intent implements Parcelable, Cloneable {
* caused the broadcast.
* @hide
*/
@SystemApi
public static final String ACTION_GLOBAL_BUTTON = "android.intent.action.GLOBAL_BUTTON";
/**