diff options
| author | Jack He <siyuanh@google.com> | 2022-02-23 17:03:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-23 17:03:06 +0000 |
| commit | 297e3c47d903c3df1ab541f66819d7ec2d238232 (patch) | |
| tree | e0fe97cb38b6e0073c8a27fdaa8714244d691117 /framework/java/android/bluetooth/BluetoothUuid.java | |
| parent | f1e50d06a97b665aaf4cadbbffc3082679bcc6e8 (diff) | |
| parent | 3a88d77b08c87cb1517fa63cbdf7f99ca10100db (diff) | |
Merge changes I343ff48c,I4b1ecf81 am: 2e6d4b4291 am: 3a88d77b08
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1985329
Change-Id: Ief6c039c89a686586c943be57be24861e0694198
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothUuid.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothUuid.java | 3 |
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 |