summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorBen Gruver <bgruv@google.com>2013-04-05 16:35:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-05 16:35:26 +0000
commit65f420ec98f451cb17e55c6ace3f249d73b33399 (patch)
tree92bca299d5cb5db52c732bcb33b323013ab3ce31 /core/java/android
parentf0a79e31d334e79c738e6c7a5e20ff06abfd142d (diff)
parent633dc9bcef0935931781d7e4554566271fe9f2c5 (diff)
Merge "Add a config updater component for the intent firewall" into jb-mr2-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/Settings.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 03ee9eb5928a..a0473a4805f0 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -5398,6 +5398,20 @@ public final class Settings {
public static final String CERT_PIN_UPDATE_METADATA_URL = "cert_pin_metadata_url";
/**
+ * URL for intent firewall updates
+ * @hide
+ */
+ public static final String INTENT_FIREWALL_UPDATE_CONTENT_URL =
+ "intent_firewall_content_url";
+
+ /**
+ * URL for intent firewall update metadata
+ * @hide
+ */
+ public static final String INTENT_FIREWALL_UPDATE_METADATA_URL =
+ "intent_firewall_metadata_url";
+
+ /**
* SELinux enforcement status. If 0, permissive; if 1, enforcing.
* @hide
*/