diff options
| author | 2020-10-15 13:48:15 +0000 | |
|---|---|---|
| committer | 2020-10-15 13:48:15 +0000 | |
| commit | 8147357dacb5c7bbf57d1cfbc92f54124e15910a (patch) | |
| tree | 714ff64af284487a5b63f57b8a70aaa00de70ed1 | |
| parent | 632533c38ec44fe45b78ece790eb047fb31327ce (diff) | |
| parent | 4c1da9c0df57b38ec1e338b1c1aec655539ba32e (diff) | |
Merge "Add HIDDEN_API_POLICY to @TestApi.i" am: c6b54a3a9c am: ab5ea0c1c5 am: 4c1da9c0df
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460404
Change-Id: Ie90f87cde805b09f3aba24c61b5b457038cb067d
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | api/test-lint-baseline.txt | 2 | ||||
| -rwxr-xr-x | 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 5379a849e3fa..d06b613c7a6f 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -3196,6 +3196,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 0287a286e69c..f5ab40abdf37 100644 --- a/api/test-lint-baseline.txt +++ b/api/test-lint-baseline.txt @@ -2499,6 +2499,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 ede88c5a123a..768d013935e9 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -13304,6 +13304,7 @@ public final class Settings { * * @hide */ + @TestApi public static final String HIDDEN_API_POLICY = "hidden_api_policy"; /** |