summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorSantos Cordon <santoscordon@google.com>2014-07-09 12:07:51 -0700
committerSantos Cordon <santoscordon@google.com>2014-07-09 19:24:25 +0000
commita4c7524b685de8c85d90e1c0e495348527530a85 (patch)
tree654a059095064c5571676d21925d3ce892997e3d /core/java
parentfa68c30bbd91c63cf1cf29822b9d0ea9b0bb5b86 (diff)
downloadframeworks_base-a4c7524b685de8c85d90e1c0e495348527530a85.zip
frameworks_base-a4c7524b685de8c85d90e1c0e495348527530a85.tar.gz
frameworks_base-a4c7524b685de8c85d90e1c0e495348527530a85.tar.bz2
unhide SHOW_REGULATORY_INFO intent.
Change-Id: If14e6599626f8570087fe56952ac3e9026ec9a94
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/Settings.java11
1 files changed, 10 insertions, 1 deletions
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 @@ public final class Settings {
@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";