commit 48e19c8cc976e94d1b3b1cdc416fd3841f141e99
author Sujith Ramakrishnan <sujithrk@google.com> Mon Apr 24 15:57:58 2017 -0700
committer Sujith Ramakrishnan <sujithrk@google.com> Thu Apr 27 13:26:43 2017 -0700
tree e1b96f3a81724794ff10f029eb78fa2f35e9a690
parent 9c14b91aa93bcc81b1b501c0a12213fb869dcf11

Updated intent action name to comply with CTS.

	- Updated "android.intent.action.GLOBAL_BUTTON" to
	  @SystemApi

Test: manual - Bottom button on Fugu brings up pairing screen
Test: manual - GUIDE button on Fugu brings up TV channels app

Bug: 37499047
Change-Id: I3b92ed99aeb53674fbaac91126e8c5e7fcffa715

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index d59184d..0535ee3 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -9893,6 +9893,7 @@
     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

diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 737ccf26..d746377 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -3228,6 +3228,7 @@
      * caused the broadcast.
      * @hide
      */
+    @SystemApi
     public static final String ACTION_GLOBAL_BUTTON = "android.intent.action.GLOBAL_BUTTON";
 
     /**