summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorMathew Inwood <mathewi@google.com>2020-10-15 12:03:55 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-10-15 12:03:55 +0000
commitc6b54a3a9cb527bdc68c45e9770fae2b232a97d6 (patch)
treed09e5292754b81487ee14213cdb422ab7e519bb3 /api
parentbd175573a55e4a9d41745f0ca4f92f969c4ed495 (diff)
parentbb935c1c24c2b3d5bb857586e406a2fcee0df323 (diff)
Merge "Add HIDDEN_API_POLICY to @TestApi.i"
Diffstat (limited to 'api')
-rw-r--r--api/test-current.txt1
-rw-r--r--api/test-lint-baseline.txt2
2 files changed, 3 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt
index 4bf0b3cbbd0e..2b76dd9be202 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -3195,6 +3195,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: