commit 14beb90f18b97982fcee63efa9a19ee21dabb039
author Jakub Pawlowski <jpawlowski@google.com> Thu Oct 12 20:36:39 2017 +0000
committer Myles Watson <mylesgw@google.com> Thu Oct 12 23:40:57 2017 +0000
tree 73bf4e5347db4f7a07629117b59c924aa41d8896
parent 17b9e1ab151518de46aa983bae5976ece55d79b0

Revert "sdp: Use complete Uuids for comparisons"

This is no longer necessary after:

ttps://android-review.googlesource.com/#/c/platform/system/bt/+/510448/

This reverts commit 63f736fe4cebe24455cb44c0dbdeb8c541d6cf47.

Change-Id: I3307f5edc43b7702f3b585042475507894075c27

android/app/jni/com_android_bluetooth_sdp.cpp

diff --git a/android/app/jni/com_android_bluetooth_sdp.cpp b/android/app/jni/com_android_bluetooth_sdp.cpp
index 91504d8..c2eb5ce 100644
--- a/android/app/jni/com_android_bluetooth_sdp.cpp
+++ b/android/app/jni/com_android_bluetooth_sdp.cpp
@@ -27,21 +27,11 @@
 
 using bluetooth::Uuid;
 
-static const Uuid UUID_OBEX_OBJECT_PUSH = Uuid::From128BitBE(
-    Uuid::UUID128Bit{{0x00, 0x00, 0x11, 0x05, 0x00, 0x00, 0x10, 0x00, 0x80,
-                      0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}});
-static const Uuid UUID_PBAP_PSE = Uuid::From128BitBE(
-    Uuid::UUID128Bit{{0x00, 0x00, 0x11, 0x2F, 0x00, 0x00, 0x10, 0x00, 0x80,
-                      0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}});
-static const Uuid UUID_MAP_MAS = Uuid::From128BitBE(
-    Uuid::UUID128Bit{{0x00, 0x00, 0x11, 0x32, 0x00, 0x00, 0x10, 0x00, 0x80,
-                      0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}});
-static const Uuid UUID_MAP_MNS = Uuid::From128BitBE(
-    Uuid::UUID128Bit{{0x00, 0x00, 0x11, 0x33, 0x00, 0x00, 0x10, 0x00, 0x80,
-                      0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}});
-static const Uuid UUID_SAP = Uuid::From128BitBE(
-    Uuid::UUID128Bit{{0x00, 0x00, 0x11, 0x2D, 0x00, 0x00, 0x10, 0x00, 0x80,
-                      0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}});
+static const Uuid UUID_OBEX_OBJECT_PUSH = Uuid::From16Bit(0x1105);
+static const Uuid UUID_PBAP_PSE = Uuid::From16Bit(0x112F);
+static const Uuid UUID_MAP_MAS = Uuid::From16Bit(0x1132);
+static const Uuid UUID_MAP_MNS = Uuid::From16Bit(0x1133);
+static const Uuid UUID_SAP = Uuid::From16Bit(0x112D);
 
 namespace android {
 static jmethodID method_sdpRecordFoundCallback;