diff options
| author | 2016-12-21 16:17:18 +0000 | |
|---|---|---|
| committer | 2016-12-21 16:17:20 +0000 | |
| commit | c8ae220ea574be60c98e40650fa245c31c04d21c (patch) | |
| tree | b596af0e6e51cc0171401f35f92ed03af10a7da4 | |
| parent | c4946d4a0007e35866de1ae850423c43d7e37995 (diff) | |
| parent | e886405dbee28726eca4d4fcb5dd73a6aaa68c12 (diff) | |
Merge "Expose hidden constant."
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rwxr-xr-x | core/java/android/provider/Settings.java | 2 |
4 files changed, 3 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index f27cf03187ad..510737532dc1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -32924,6 +32924,7 @@ package android.provider { field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS"; field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS"; field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS"; + field public static final java.lang.String ACTION_ZEN_MODE_PRIORITY_SETTINGS = "android.settings.ZEN_MODE_PRIORITY_SETTINGS"; field public static final java.lang.String AUTHORITY = "settings"; field public static final java.lang.String EXTRA_ACCOUNT_TYPES = "account_types"; field public static final java.lang.String EXTRA_AIRPLANE_MODE_ENABLED = "airplane_mode_enabled"; diff --git a/api/system-current.txt b/api/system-current.txt index 8f91d85d79dc..2f73e92a80cd 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -35732,6 +35732,7 @@ package android.provider { field public static final java.lang.String ACTION_WIFI_SAVED_NETWORK_SETTINGS = "android.settings.WIFI_SAVED_NETWORK_SETTINGS"; field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS"; field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS"; + field public static final java.lang.String ACTION_ZEN_MODE_PRIORITY_SETTINGS = "android.settings.ZEN_MODE_PRIORITY_SETTINGS"; field public static final java.lang.String AUTHORITY = "settings"; field public static final java.lang.String EXTRA_ACCOUNT_TYPES = "account_types"; field public static final java.lang.String EXTRA_AIRPLANE_MODE_ENABLED = "airplane_mode_enabled"; diff --git a/api/test-current.txt b/api/test-current.txt index 4f1f147724b2..4c08084b29c6 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -33038,6 +33038,7 @@ package android.provider { field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS"; field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS"; field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS"; + field public static final java.lang.String ACTION_ZEN_MODE_PRIORITY_SETTINGS = "android.settings.ZEN_MODE_PRIORITY_SETTINGS"; field public static final java.lang.String AUTHORITY = "settings"; field public static final java.lang.String EXTRA_ACCOUNT_TYPES = "account_types"; field public static final java.lang.String EXTRA_AIRPLANE_MODE_ENABLED = "airplane_mode_enabled"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index f1b00d602c6d..488c2283b331 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1072,8 +1072,6 @@ public final class Settings { /** * Activity Action: Show Zen Mode priority configuration settings. - * - * @hide */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_ZEN_MODE_PRIORITY_SETTINGS |