summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJakub Pawlowski <jpawlowski@google.com>2018-02-26 19:31:12 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-26 19:31:12 +0000
commit8d03a60930e2ab90ea3f97f1e2133aa87dd48919 (patch)
tree9a6c12599eb7a33d299e46748ca002b840615114 /core/java
parent8ac26bad64caa8f6c426188a7daaa7e4a6a02e3a (diff)
parent7f2091c5221684383775e22008c7d164f67ea79e (diff)
Merge "Use assigned UUID for Hearing Aid Service" am: d310970d36
am: 7f2091c522 Change-Id: I3e54498760d071a38d60467c2865a77374f8c928
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/bluetooth/BluetoothUuid.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothUuid.java b/core/java/android/bluetooth/BluetoothUuid.java
index 0a0d21498032..605dbd21993f 100644
--- a/core/java/android/bluetooth/BluetoothUuid.java
+++ b/core/java/android/bluetooth/BluetoothUuid.java
@@ -79,9 +79,8 @@ public final class BluetoothUuid {
ParcelUuid.fromString("00001132-0000-1000-8000-00805F9B34FB");
public static final ParcelUuid SAP =
ParcelUuid.fromString("0000112D-0000-1000-8000-00805F9B34FB");
- /* TODO: b/69623109 update this value. It will change to 16bit UUID!! */
public static final ParcelUuid HearingAid =
- ParcelUuid.fromString("7312C48F-22CC-497F-85FD-A0616A3B9E05");
+ ParcelUuid.fromString("0000FDF0-0000-1000-8000-00805f9b34fb");
public static final ParcelUuid BASE_UUID =
ParcelUuid.fromString("00000000-0000-1000-8000-00805F9B34FB");