Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add HIDDEN_API_POLICY to @TestApi.i" am: c6b54a3a9c am: ab5ea0c1c5 am: 4c1da9c0df

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460404

Change-Id: Ie90f87cde805b09f3aba24c61b5b457038cb067d
This commit is contained in:
Mathew Inwood
2020-10-15 13:48:15 +00:00
committed by Automerger Merge Worker
parent 632533c38e 4c1da9c0df
commit 8147357dac
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/test-current.txt
View File

@@ -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";

2
api/test-lint-baseline.txt
View File

@@ -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:

1
core/java/android/provider/Settings.java
View File

@@ -13304,6 +13304,7 @@ public final class Settings {
*
* @hide
*/
@TestApi
public static final String HIDDEN_API_POLICY = "hidden_api_policy";
/**