Merge "Add a separate namespace for CaptivePortalLogin module." am: c9b6889e04 am: 6c6b1f1c4b am: 8089e2a48a am: a086351846
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873954
Change-Id: Id20b9fa3b0a7eb4dae431f82abad5d54926da7f0
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 7a2ee90..88944f17 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -9199,6 +9199,7 @@
field public static final String NAMESPACE_BIOMETRICS = "biometrics";
field public static final String NAMESPACE_BLOBSTORE = "blobstore";
field public static final String NAMESPACE_BLUETOOTH = "bluetooth";
+ field public static final String NAMESPACE_CAPTIVEPORTALLOGIN = "captive_portal_login";
field public static final String NAMESPACE_CLIPBOARD = "clipboard";
field public static final String NAMESPACE_CONNECTIVITY = "connectivity";
field public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture";
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index 8de9d23..1f98439 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -181,6 +181,14 @@
public static final String NAMESPACE_CONNECTIVITY = "connectivity";
/**
+ * Namespace for CaptivePortalLogin module.
+ *
+ * @hide
+ */
+ @SystemApi
+ public static final String NAMESPACE_CAPTIVEPORTALLOGIN = "captive_portal_login";
+
+ /**
* Namespace for content capture feature used by on-device machine intelligence
* to provide suggestions in a privacy-safe manner.
*