Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I5049d78af02e0104504d6d7491c369cb85186e45
This commit is contained in:
Xiao Ma
2021-11-01 11:38:33 +00:00
committed by Automerger Merge Worker
parent dd42536ca6 6c6b1f1c4b
commit 8089e2a48a
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -9151,6 +9151,7 @@ package android.provider {
field public static final String NAMESPACE_BIOMETRICS = "biometrics"; field public static final String NAMESPACE_BIOMETRICS = "biometrics";
field public static final String NAMESPACE_BLOBSTORE = "blobstore"; field public static final String NAMESPACE_BLOBSTORE = "blobstore";
field public static final String NAMESPACE_BLUETOOTH = "bluetooth"; 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_CLIPBOARD = "clipboard";
field public static final String NAMESPACE_CONNECTIVITY = "connectivity"; field public static final String NAMESPACE_CONNECTIVITY = "connectivity";
field public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture"; field public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture";

8
core/java/android/provider/DeviceConfig.java
View File

@@ -180,6 +180,14 @@ public final class DeviceConfig {
@SystemApi @SystemApi
public static final String NAMESPACE_CONNECTIVITY = "connectivity"; 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 * Namespace for content capture feature used by on-device machine intelligence
* to provide suggestions in a privacy-safe manner. * to provide suggestions in a privacy-safe manner.