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

Commit 4bce571f authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

Merge "Add NAMESPACE_BLUETOOTH for bluetooth feature experiments" into... 

Merge "Add NAMESPACE_BLUETOOTH for bluetooth feature experiments" into rvc-dev-plus-aosp am: eaa2b321

Change-Id: Ia3d063f218c2cca9fef47cf3d661dd66010fad0f
parents 11c102c4 eaa2b321

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8958,6 +8958,7 @@ package android.provider { 
    field public static final String NAMESPACE_AUTOFILL = "autofill";

    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_CONNECTIVITY = "connectivity";

    field public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture";

    field @Deprecated public static final String NAMESPACE_DEX_BOOT = "dex_boot";

core/java/android/provider/DeviceConfig.java

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

    public static final String NAMESPACE_BLOBSTORE = "blobstore";



    /**

     * Namespace for all Bluetooth related features.

     *

     * @hide

     */

    @SystemApi

    public static final String NAMESPACE_BLUETOOTH = "bluetooth";



    /**

     * Namespace for all networking connectivity related features.

     *

non-updatable-api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7849,6 +7849,7 @@ package android.provider { 
    field public static final String NAMESPACE_AUTOFILL = "autofill";

    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_CONNECTIVITY = "connectivity";

    field public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture";

    field @Deprecated public static final String NAMESPACE_DEX_BOOT = "dex_boot";