From 1eec532a8eb736f6dccd27c24522b034e0d8bdea Mon Sep 17 00:00:00 2001 From: Zach Johnson Date: Fri, 15 May 2020 10:51:44 -0700 Subject: [PATCH] Add NAMESPACE_BLUETOOTH for bluetooth feature experiments Exempt-From-Owner-Approval: exact cherry-pick from already approved master CL. Test: compile Bug: 156757711 Merged-In: I330b8cc5aeb14ebcc15fb88c605ac72770497040 Change-Id: I330b8cc5aeb14ebcc15fb88c605ac72770497040 (cherry picked from commit 9b9235981c880a25367604279c4673df71b1a578) --- api/system-current.txt | 1 + core/java/android/provider/DeviceConfig.java | 8 ++++++++ non-updatable-api/system-current.txt | 1 + 3 files changed, 10 insertions(+) diff --git a/api/system-current.txt b/api/system-current.txt index 68e7849dc3e31..855a083e9c324 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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"; diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index e86aa62d00bcc..b45a1eba1e2f6 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -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. * diff --git a/non-updatable-api/system-current.txt b/non-updatable-api/system-current.txt index 8246c0657aff8..eff406631d8d7 100644 --- a/non-updatable-api/system-current.txt +++ b/non-updatable-api/system-current.txt @@ -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";