Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c1da9c0 authored by Mathew Inwood's avatar Mathew Inwood Committed by Automerger Merge Worker
Browse files

Merge "Add HIDDEN_API_POLICY to @TestApi.i" am: c6b54a3a am: ab5ea0c1 

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

Change-Id: I4cb38bce944212ee3487279a01934009bc7ba418
parents bd9245a7 ab5ea0c1

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

api/test-lint-baseline.txt

+2 −0
Original line number Diff line number Diff line
@@ -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:

core/java/android/provider/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -13275,6 +13275,7 @@ public final class Settings { 
         *

         * @hide

         */

        @TestApi

        public static final String HIDDEN_API_POLICY = "hidden_api_policy";















        /**