commit 6c6b1f1c4b22809fa44f0e4150ed965dba2875d4
author Xiao Ma <xiaom@google.com> Mon Nov 01 11:20:28 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 01 11:20:28 2021 +0000
tree 5f2e7743a45c6606c76651aed108db4ecdc5c803
parent 1d6536fda4a1168bbbb829a41480400f9fd7c149
parent c9b6889e045b5e8e6f4743849155081597266c96

Merge "Add a separate namespace for CaptivePortalLogin module." am: c9b6889e04

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

Change-Id: I333eb00c1c424e1e679f463f1f8d96507da3184f

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 4248f91..ea86c0f 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -9151,6 +9151,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";

core/java/android/provider/DeviceConfig.java

diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index 25e3a4f..4145d27 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.
      *