summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-02-16 11:50:20 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-02-16 11:50:20 +0000
commit46656fa28ec257c8ffcfe4964da3d8047cff49d4 (patch)
tree4b8ef6f38b0ca086d70e4389704727a74ef9da36 /core/java/android
parentf50d9fbdc167c8f87465fb7521befe5182a710a8 (diff)
parentfe1eebec5d3a9c28b15b2ac8843859da484af0d6 (diff)
Merge "Hidden API blacklisting killswitch."
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/Settings.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 86f48214db00..f4842c6ca6c5 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -10387,6 +10387,14 @@ public final class Settings {
"storage_settings_clobber_threshold";
/**
+ * Exemptions to the hidden API blacklist.
+ *
+ * @hide
+ */
+ public static final String HIDDEN_API_BLACKLIST_EXEMPTIONS =
+ "hidden_api_blacklist_exemptions";
+
+ /**
* Settings to backup. This is here so that it's in the same place as the settings
* keys and easy to update.
*