Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8089e2a4 authored by Xiao Ma's avatar Xiao Ma Committed by Automerger Merge Worker
Browse files

Merge "Add a separate namespace for CaptivePortalLogin module." am: c9b6889e am: 6c6b1f1c 

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

Change-Id: I5049d78af02e0104504d6d7491c369cb85186e45
parents dd42536c 6c6b1f1c

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9151,6 +9151,7 @@ package android.provider { 
    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

+8 −0
Original line number Diff line number Diff line
@@ -180,6 +180,14 @@ public final class DeviceConfig { 
    @SystemApi

    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.