commit a4c7524b685de8c85d90e1c0e495348527530a85
author Santos Cordon <santoscordon@google.com> Wed Jul 09 12:07:51 2014 -0700
committer Santos Cordon <santoscordon@google.com> Wed Jul 09 19:24:25 2014 +0000
tree 654a059095064c5571676d21925d3ce892997e3d
parent fa68c30bbd91c63cf1cf29822b9d0ea9b0bb5b86

unhide SHOW_REGULATORY_INFO intent.

Change-Id: If14e6599626f8570087fe56952ac3e9026ec9a94

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 9b9bfe9..e8e4e0c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -24508,6 +24508,7 @@
     field public static final java.lang.String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS";
     field public static final java.lang.String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS";
     field public static final java.lang.String ACTION_SETTINGS = "android.settings.SETTINGS";
+    field public static final java.lang.String ACTION_SHOW_REGULATORY_INFO = "android.settings.SHOW_REGULATORY_INFO";
     field public static final java.lang.String ACTION_SOUND_SETTINGS = "android.settings.SOUND_SETTINGS";
     field public static final java.lang.String ACTION_SYNC_SETTINGS = "android.settings.SYNC_SETTINGS";
     field public static final java.lang.String ACTION_USER_DICTIONARY_SETTINGS = "android.settings.USER_DICTIONARY_SETTINGS";

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 206b75d..99e108f 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -764,7 +764,16 @@
     @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
     public static final String ACTION_ZEN_MODE_SETTINGS = "android.settings.ZEN_MODE_SETTINGS";
 
-    /** {@hide} */
+    /**
+     * Activity Action: Show the regulatory information screen for the device.
+     * <p>
+     * In some cases, a matching Activity may not exist, so ensure you safeguard
+     * against this.
+     * <p>
+     * Input: Nothing.
+     * <p>
+     * Output: Nothing.
+     */
     @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
     public static final String
             ACTION_SHOW_REGULATORY_INFO = "android.settings.SHOW_REGULATORY_INFO";