summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothUuid.java
diff options
context:
space:
mode:
authorJack He <siyuanh@google.com>2022-02-23 16:58:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-02-23 16:58:03 +0000
commit3a88d77b08c87cb1517fa63cbdf7f99ca10100db (patch)
treec2c8d3e52f453cfd79776457c35d2935a698b93c /framework/java/android/bluetooth/BluetoothUuid.java
parent89b965d721c1b41755dc4935e576158d554714e5 (diff)
parent2e6d4b42917664491cd42bc0e13a2961ef058db4 (diff)
Merge changes I343ff48c,I4b1ecf81 am: 2e6d4b4291
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1985329 Change-Id: Id92c7e06e2d4a4ecbbf63942a922613ce6484020
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothUuid.java')
-rw-r--r--framework/java/android/bluetooth/BluetoothUuid.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothUuid.java b/framework/java/android/bluetooth/BluetoothUuid.java
index b41d78b498..7847718c5d 100644
--- a/framework/java/android/bluetooth/BluetoothUuid.java
+++ b/framework/java/android/bluetooth/BluetoothUuid.java
@@ -158,9 +158,8 @@ public final class BluetoothUuid {
/** @hide */
@NonNull
@SystemApi
- /* FIXME: Not known yet, using a placeholder instead. */
public static final ParcelUuid HAS =
- ParcelUuid.fromString("EEEEEEEE-EEEE-EEEE-EEEE-EEEEEEEEEEEE");
+ ParcelUuid.fromString("00001854-0000-1000-8000-00805F9B34FB");
/** @hide */
@NonNull
@SystemApi