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

Commit 153da0d8 authored by Sujith Ramakrishnan's avatar Sujith Ramakrishnan Committed by android-build-merger
Browse files

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

am: 193b44df

Change-Id: I7fb668ba666a39beb6e6a12f79dc5d8bb4f38f47
parents f5ec928b 193b44df

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9899,6 +9899,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";

core/java/android/content/Intent.java

+1 −0
Original line number Diff line number Diff line
@@ -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";



    /**