From 1cb694b947d07505f8abf5dd54c5e69f72c2a7a0 Mon Sep 17 00:00:00 2001 From: Attila Dusnoki Date: Wed, 7 Dec 2016 00:03:59 +0100 Subject: [PATCH] Fix invalid descriptor uuid --- components/bluetooth/test.rs | 2 +- resources/gatt_blocklist.txt | 4 ++-- .../wpt/mozilla/tests/mozilla/bluetooth/bluetooth-helpers.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/bluetooth/test.rs b/components/bluetooth/test.rs index 8578db79aa5e..e2c6e639e827 100644 --- a/components/bluetooth/test.rs +++ b/components/bluetooth/test.rs @@ -99,7 +99,7 @@ const SERIAL_NUMBER_STRING_UUID: &'static str = "00002a25-0000-1000-8000-00805f9 // Descriptor UUIDs const BLOCKLIST_EXCLUDE_READS_DESCRIPTOR_UUID: &'static str = "aaaaaaaa-aaaa-1181-0510-810819516110"; -const BLOCKLIST_DESCRIPTOR_UUID: &'static str = "07711111-6104-0970-7011-1107105110aaa"; +const BLOCKLIST_DESCRIPTOR_UUID: &'static str = "07711111-6104-0970-7011-1107105110aa"; // https://www.bluetooth.com/specifications/gatt/ // viewer?attributeXmlFile=org.bluetooth.descriptor.gatt.characteristic_user_description.xml const CHARACTERISTIC_USER_DESCRIPTION_UUID: &'static str = "00002901-0000-1000-8000-00805f9b34fb"; diff --git a/resources/gatt_blocklist.txt b/resources/gatt_blocklist.txt index 189a2c5fe0fa..e7f39fa77a57 100644 --- a/resources/gatt_blocklist.txt +++ b/resources/gatt_blocklist.txt @@ -56,7 +56,7 @@ bad1c9a2-9a5b-4015-8b60-1579bbbf2135 exclude-reads 00002903-0000-1000-8000-00805f9b34fb exclude-writes # Blocklisted descriptor used to test. -07711111-6104-0970-7011-1107105110aaa +07711111-6104-0970-7011-1107105110aa # Blocklisted descriptor used to test. -aaaaaaaa-aaaa-1181-0510-810819516110 exclude-reads \ No newline at end of file +aaaaaaaa-aaaa-1181-0510-810819516110 exclude-reads diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/bluetooth-helpers.js b/tests/wpt/mozilla/tests/mozilla/bluetooth/bluetooth-helpers.js index c09835284d56..16a280cca298 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/bluetooth-helpers.js +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/bluetooth-helpers.js @@ -9,7 +9,7 @@ var blocklist_exclude_reads_characteristic_uuid = "bad1c9a2-9a5b-4015-8b60-1579b var request_disconnection_characteristic_uuid = "01d7d88a-7451-419f-aeb8-d65e7b9277af"; // Descriptors: var blocklist_exclude_reads_descriptor_uuid = "aaaaaaaa-aaaa-1181-0510-810819516110"; -var blocklist_descriptor_uuid = "07711111-6104-0970-7011-1107105110aaa"; +var blocklist_descriptor_uuid = "07711111-6104-0970-7011-1107105110aa"; var characteristic_user_description_uuid = "00002901-0000-1000-8000-00805f9b34fb"; // Bluetooth Adapter types: