diff options
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | api/test-lint-baseline.txt | 2 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index f117a7f332ed..82123598da31 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -3385,6 +3385,7 @@ package android.provider { field public static final String DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD = "dynamic_power_savings_disable_threshold"; field public static final String DYNAMIC_POWER_SAVINGS_ENABLED = "dynamic_power_savings_enabled"; field public static final String HIDDEN_API_BLACKLIST_EXEMPTIONS = "hidden_api_blacklist_exemptions"; + field public static final String HIDDEN_API_POLICY = "hidden_api_policy"; field public static final String HIDE_ERROR_DIALOGS = "hide_error_dialogs"; field public static final String LOCATION_GLOBAL_KILL_SWITCH = "location_global_kill_switch"; field public static final String LOCATION_IGNORE_SETTINGS_PACKAGE_WHITELIST = "location_ignore_settings_package_whitelist"; diff --git a/api/test-lint-baseline.txt b/api/test-lint-baseline.txt index 91a09e3d8890..6682583aa219 100644 --- a/api/test-lint-baseline.txt +++ b/api/test-lint-baseline.txt @@ -2511,6 +2511,8 @@ NoSettingsProvider: android.provider.Settings.Global#DYNAMIC_POWER_SAVINGS_ENABL NoSettingsProvider: android.provider.Settings.Global#HIDDEN_API_BLACKLIST_EXEMPTIONS: +NoSettingsProvider: android.provider.Settings.Global#HIDDEN_API_POLICY: + NoSettingsProvider: android.provider.Settings.Global#HIDE_ERROR_DIALOGS: NoSettingsProvider: android.provider.Settings.Global#LOCATION_GLOBAL_KILL_SWITCH: diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index b383b6ed5faf..23218c0a0ac6 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -13407,6 +13407,7 @@ public final class Settings { * * @hide */ + @TestApi public static final String HIDDEN_API_POLICY = "hidden_api_policy"; /** |