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

Commit 74cc53ca authored by Xinyi Zhou's avatar Xinyi Zhou Committed by Automerger Merge Worker
Browse files

Merge "Add NAMESPACE_NEARBY String" am: 4339e514 am: 9bd0f75b am: f58897e7 am: f4b45a5f 

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



Change-Id: I9df2cd99dd2a382ebda09e5acadb825fcc415798
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2fd8d5e5 f4b45a5f

core/api/system-current.txt

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

    field public static final String NAMESPACE_MEDIA = "media";

    field public static final String NAMESPACE_MEDIA_NATIVE = "media_native";

    field public static final String NAMESPACE_NEARBY = "nearby";

    field public static final String NAMESPACE_NETD_NATIVE = "netd_native";

    field public static final String NAMESPACE_NNAPI_NATIVE = "nnapi_native";

    field public static final String NAMESPACE_ON_DEVICE_PERSONALIZATION = "on_device_personalization";

core/java/android/provider/DeviceConfig.java

+9 −0
Original line number Diff line number Diff line
@@ -203,6 +203,15 @@ public final class DeviceConfig { 
    @SystemApi

    public static final String NAMESPACE_TETHERING = "tethering";





    /**

     * Namespace for Nearby module.

     *

     * @hide

     */

    @SystemApi

    public static final String NAMESPACE_NEARBY = "nearby";



    /**

     * Namespace for content capture feature used by on-device machine intelligence

     * to provide suggestions in a privacy-safe manner.