From bb935c1c24c2b3d5bb857586e406a2fcee0df323 Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Mon, 12 Oct 2020 15:16:30 +0100 Subject: [PATCH] Add HIDDEN_API_POLICY to @TestApi.i This is a cherry-pick from internal master. Test: cd cts/tests/signature; atest Bug: 170428909 Bug: 169987505 Merged-In: I68231850a000243cd01ba066585322cab7608884 Change-Id: I68231850a000243cd01ba066585322cab7608884 --- api/test-current.txt | 1 + api/test-lint-baseline.txt | 2 ++ core/java/android/provider/Settings.java | 1 + 3 files changed, 4 insertions(+) diff --git a/api/test-current.txt b/api/test-current.txt index 415ed034f1763..1493ca0c71e4d 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -3290,6 +3290,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 0287a286e69c3..f5ab40abdf37a 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 9ee88982f5980..d9aae25065f65 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -13278,6 +13278,7 @@ public final class Settings { * * @hide */ + @TestApi public static final String HIDDEN_API_POLICY = "hidden_api_policy"; /**