Граф коммитов

1289 Коммитов

Автор SHA1 Сообщение Дата
Wes Kocher aa6cf3235f Merge inbound to m-c a=merge CLOSED TREE
--HG--
rename : dom/bluetooth/bluetooth1/BluetoothRilListener.cpp => dom/bluetooth/BluetoothRilListener.cpp
2015-04-20 16:44:05 -07:00
Thomas Zimmermann b4be1c364e Bug 1155718: Share ObexBase.{cpp,h} between Bluetooth v1 and v2, r=btian
Both implementations are the same.

--HG--
rename : dom/bluetooth/bluetooth2/ObexBase.cpp => dom/bluetooth/ObexBase.cpp
rename : dom/bluetooth/bluetooth2/ObexBase.h => dom/bluetooth/ObexBase.h
2015-04-20 12:56:49 +02:00
Thomas Zimmermann 42bd36b546 Bug 1155718: Share BluetoothSocketObserver.h between Bluetooth v1 and v2, r=btian
Both implementations are the same.

--HG--
rename : dom/bluetooth/bluetooth2/BluetoothSocketObserver.h => dom/bluetooth/BluetoothSocketObserver.h
2015-04-20 12:56:49 +02:00
Thomas Zimmermann 97e36fab99 Bug 1155718: Share BlueoothRilListener.{cpp,h} between Bluetooth v1 and v2, r=btian
This patch uses the v1 implementation, which include a fix for bug 1137151.

--HG--
rename : dom/bluetooth/bluetooth1/BluetoothRilListener.cpp => dom/bluetooth/BluetoothRilListener.cpp
rename : dom/bluetooth/bluetooth1/BluetoothRilListener.h => dom/bluetooth/BluetoothRilListener.h
2015-04-20 12:56:49 +02:00
Thomas Zimmermann ccca8eab46 Bug 1155718: Share BluetoothProfileManagerBase.h between Bluetooth v1 and v2, r=btian
This patch uses the v1 implementation, which include a fix for bug 1137151.

--HG--
rename : dom/bluetooth/bluetooth1/BluetoothProfileManagerBase.h => dom/bluetooth/BluetoothProfileManagerBase.h
2015-04-20 12:56:49 +02:00
Thomas Zimmermann 38b3f96a77 Bug 1155718: Share BluetoothHidManager.{cpp,h} between Bluetooth v1 and v2, r=btian
This patch uses the v1 implementation, which include a fix for bug 1137151.

--HG--
rename : dom/bluetooth/bluetooth1/BluetoothHidManager.cpp => dom/bluetooth/BluetoothHidManager.cpp
rename : dom/bluetooth/bluetooth1/BluetoothHidManager.h => dom/bluetooth/BluetoothHidManager.h
2015-04-20 12:56:49 +02:00
Thomas Zimmermann 05ee446fab Bug 1155718: Share BluetoothHfpMangerBase.h between Bluetooth v1 and v2, r=btian
Both implementations are the same, except coding-style fixes in v1.

--HG--
rename : dom/bluetooth/bluetooth2/BluetoothHfpManagerBase.h => dom/bluetooth/BluetoothHfpManagerBase.h
2015-04-20 12:56:49 +02:00
Denis Volk 32e981896d Bug 1095098 - move do_QueryObject templates into their own header; r=froydnj 2015-04-15 12:47:03 -04:00
Thomas Zimmermann 2057f83879 Bug 1155082: Share BluetoothUUID.{cpp,h} between Bluetooth v1 and v2, r=btian
BluetoothUUID of v1 and v2 are the same, except for bug 1015819 in
v1. So this patch moves the v1 variant to a shared location and removes
the v2 variant completely.

--HG--
rename : dom/bluetooth/bluetooth1/BluetoothUuid.cpp => dom/bluetooth/BluetoothUuid.cpp
rename : dom/bluetooth/bluetooth1/BluetoothUuid.h => dom/bluetooth/BluetoothUuid.h
2015-04-17 17:45:05 +02:00
Bruce Sun c1123fbf68 Bug 1152653 - Implement BluetoothGatt.oncharacteristicchanged. r=jocelyn, r=mrbkap 2015-04-16 16:47:01 +08:00
Bruce Sun 056f82d8c9 Bug 1140952 - Implement read/write value of a descriptor for GATT client API (ipc part). f=jocelyn, r=btian 2015-04-16 16:45:20 +08:00
Bruce Sun ea2fb4850a Bug 1140952 - Implement read/write value of a descriptor for GATT client API (webapi part). f=jocelyn, r=btian, r=mrbkap 2015-04-16 16:44:58 +08:00
Bruce Sun c20fe1eef4 Bug 1140952 - Implement read/write value of a characteristic for GATT client API (ipc part). f=jocelyn, r=btian 2015-04-16 16:44:37 +08:00
Bruce Sun 467430b746 Bug 1140952 - Implement read/write value of a characteristic for GATT client API (webapi part). f=jocelyn, r=shawnjohnjr, r=mrbkap 2015-04-16 16:44:17 +08:00
Thomas Zimmermann ca73054656 Bug 1154235: Use |snprintf| in Bluetooth utililities, r=btian
The use of |sprintf| is unsafe and generally deprecated. This patch
replaces |sprintf| in the Bluetooth utilities with |snprintf|.
2015-04-16 10:48:21 +02:00
Thomas Zimmermann f0aea25638 Bug 1154235: Share BluetoothUtils.{cpp,h} between Bluetooth v1 and v2, r=btian
With this patch, Bluetooth v1 and v2 share the same files for
BluetoothUtils.{cpp,h}. Some of the functions are still version specific
and cannot be shared. The v1 variants can be removed after switching to
v2.
2015-04-16 10:48:21 +02:00
Thomas Zimmermann aadf127b62 Bug 1154235: Move dom/bluetooth/bluetooth2/BluetoothUtils.{cpp,h} to /dom/bluetooth, r=btian
--HG--
rename : dom/bluetooth/bluetooth2/BluetoothUtils.cpp => dom/bluetooth/BluetoothUtils.cpp
rename : dom/bluetooth/bluetooth2/BluetoothUtils.h => dom/bluetooth/BluetoothUtils.h
2015-04-16 10:48:21 +02:00
Thomas Zimmermann 7080f6c772 Bug 1154235: Use |BroadcastSystemMessage| in |BluetoothService::Notify|, r=btian
|BluetoothService::Notify| re-implements |BroadcastSystemMessage|. This
patch replaces this code with a call to the function.
2015-04-16 10:48:21 +02:00
Shawn Huang 931df00596 Bug 1152098 - Ignore subsequent toggling requests if toggling is already in progress. r=btian
--HG--
extra : histedit_source : 62052c8ffd607ff9381980a0a4c5cd5af52f9b0a
2015-04-14 20:55:00 -04:00
Thomas Zimmermann 8b16914471 Bug 1153796: Share BluetoothInterfaceHelpers.{cpp,h} between Bluetooth v1 and v2, r=btian
The v1 implementation of BluetoothInterfaceHelpers.{cpp,h} is more
up-to-date than the v2 variant. So we can just use the v1 version and
remove the v2 version entirely. Bluetooth v2 contains its own version
of |Convert(nsresult, BluetoothStatus)|, which has been removed in
favor of the shared implementation.

--HG--
rename : dom/bluetooth/bluetooth1/BluetoothInterfaceHelpers.cpp => dom/bluetooth/BluetoothInterfaceHelpers.cpp
rename : dom/bluetooth/bluetooth1/BluetoothInterfaceHelpers.h => dom/bluetooth/BluetoothInterfaceHelpers.h
2015-04-15 11:46:33 +02:00
Thomas Zimmermann 25c352176c Bug 1153796: Share BluetoothInterface.{cpp,h} between Bluetooth v1 and v2, r=btian
With this patch, Bluetooth v1 and v2 share the same interfaces classes
for their backend code. Bluetooth v1 doesn't yet support GATT, so the
GATT interfaces are still not implemented.

The patch also fixes the GATT-specific classes to compile under recent GCC
versions 4.8 and later, which are used with Android L.

The patch also preserves the prefered backend for each version. Bluetooth
v1 defaults to 'bluetoothd,' v2 defaults to 'bluedroid.'
2015-04-15 11:46:33 +02:00
Thomas Zimmermann c3608191ca Bug 1153796: Move dom/bluetooth/bluetooth2/BluetoothInterface.{cpp,h} to dom/bluetooth, r=btian
--HG--
rename : dom/bluetooth/bluetooth2/BluetoothInterface.cpp => dom/bluetooth/BluetoothInterface.cpp
rename : dom/bluetooth/bluetooth2/BluetoothInterface.h => dom/bluetooth/BluetoothInterface.h
2015-04-15 11:46:33 +02:00
Thomas Zimmermann af21064b9c Bug 1153796: Unify variants of |BluetoothInterface::SspReply|, r=btian
Bluetooth use different types for the second argument of their variant
of |BluetoothInterface::SspReply|. This patch standardizes them on the
v2 version.
2015-04-15 11:46:33 +02:00
Carsten "Tomcat" Book 660521f516 Backed out changeset 3a16edeb9ed2 (bug 1153796) for bustage on a CLOSED TREE 2015-04-15 11:33:02 +02:00
Carsten "Tomcat" Book 4e0750765d Backed out changeset 0f94e1a00fcd (bug 1153796)
--HG--
rename : dom/bluetooth/BluetoothInterface.cpp => dom/bluetooth/bluetooth2/BluetoothInterface.cpp
rename : dom/bluetooth/BluetoothInterface.h => dom/bluetooth/bluetooth2/BluetoothInterface.h
2015-04-15 11:32:21 +02:00
Carsten "Tomcat" Book 90d9543ab6 Backed out changeset a74d1c644c84 (bug 1153796) 2015-04-15 11:32:16 +02:00
Carsten "Tomcat" Book dc4923c9f7 Backed out changeset 868ace3fafba (bug 1153796)
--HG--
rename : dom/bluetooth/BluetoothInterfaceHelpers.cpp => dom/bluetooth/bluetooth1/BluetoothInterfaceHelpers.cpp
rename : dom/bluetooth/BluetoothInterfaceHelpers.h => dom/bluetooth/bluetooth1/BluetoothInterfaceHelpers.h
2015-04-15 11:32:10 +02:00
Thomas Zimmermann 5cb077cd58 Bug 1153796: Share BluetoothInterfaceHelpers.{cpp,h} between Bluetooth v1 and v2, r=btian
The v1 implementation of BluetoothInterfaceHelpers.{cpp,h} is more
up-to-date than the v2 variant. So we can just use the v1 version and
remove the v2 version entirely. Bluetooth v2 contains its own version
of |Convert(nsresult, BluetoothStatus)|, which has been removed in
favor of the shared implementation.

--HG--
rename : dom/bluetooth/bluetooth1/BluetoothInterfaceHelpers.cpp => dom/bluetooth/BluetoothInterfaceHelpers.cpp
rename : dom/bluetooth/bluetooth1/BluetoothInterfaceHelpers.h => dom/bluetooth/BluetoothInterfaceHelpers.h
2015-04-15 11:04:43 +02:00
Thomas Zimmermann 81e83b639b Bug 1153796: Share BluetoothInterface.{cpp,h} between Bluetooth v1 and v2, r=btian
With this patch, Bluetooth v1 and v2 share the same interfaces classes
for their backend code. Bluetooth v1 doesn't yet support GATT, so the
GATT interfaces are still not implemented.

The patch also fixes the GATT-specific classes to compile under recent GCC
versions 4.8 and later, which are used with Android L.

The patch also preserves the prefered backend for each version. Bluetooth
v1 defaults to 'bluetoothd,' v2 defaults to 'bluedroid.'
2015-04-15 11:04:43 +02:00
Thomas Zimmermann c2f24a1548 Bug 1153796: Move dom/bluetooth/bluetooth2/BluetoothInterface.{cpp,h} to dom/bluetooth, r=btian
--HG--
rename : dom/bluetooth/bluetooth2/BluetoothInterface.cpp => dom/bluetooth/BluetoothInterface.cpp
rename : dom/bluetooth/bluetooth2/BluetoothInterface.h => dom/bluetooth/BluetoothInterface.h
2015-04-15 11:04:43 +02:00
Thomas Zimmermann c32d85b108 Bug 1153796: Unify variants of |BluetoothInterface::SspReply|, r=btian
Bluetooth use different types for the second argument of their variant
of |BluetoothInterface::SspReply|. This patch standardizes them on the
v2 version.
2015-04-15 11:04:43 +02:00
Jamin Liu 86a4f50475 Bug 1154136 - Update Bluetooth connection state when BT stack updates device properties. r=shuang 2015-04-14 18:46:23 +08:00
Thomas Zimmermann 357f6c2529 Bug 1152821: Share BluetoothCommon.h between Bluetooth v1 and v2, r=joliu
This patch integrates changes from Bluetooth v1 into the shared file
BluetoothCommon.h, and makes it available to both versions. The enum
constant TYPE_INVALID is replaced by NUM_TYPE.
2015-04-14 10:26:06 +02:00
Thomas Zimmermann c92e91ba0f Bug 1152821: Move dom/bluetooth/bluetooth2/BluetoothCommon.h to dom/bluetooth, r=joliu
--HG--
rename : dom/bluetooth/bluetooth2/BluetoothCommon.h => dom/bluetooth/BluetoothCommon.h
2015-04-14 10:26:06 +02:00
Ben Tian 7895eb1e99 Bug 1152694 - Make UUID and service name as input arguments for BluetoothSocket, r=tzimmermann 2015-04-13 17:30:47 +08:00
Carsten "Tomcat" Book b66faa9524 Backed out changeset 3939c36b0864 (bug 1152821) for Bustage
--HG--
rename : dom/bluetooth/BluetoothCommon.h => dom/bluetooth/bluetooth2/BluetoothCommon.h
2015-04-13 10:54:33 +02:00
Carsten "Tomcat" Book 44617229af Backed out changeset 81c108144278 (bug 1152821) 2015-04-13 10:53:59 +02:00
Thomas Zimmermann 2770ffad45 Bug 1152821: Share BluetoothCommon.h between Bluetooth v1 and v2, r=joliu
This patch integrates changes from Bluetooth v1 into the shared file
BluetoothCommon.h, and makes it available to both versions. The enum
constant TYPE_INVALID is replaced by NUM_TYPE.
2015-04-13 10:03:11 +02:00
Thomas Zimmermann 3444f08f45 Bug 1152821: Move dom/bluetooth/bluetooth2/BluetoothCommon.h to dom/bluetooth, r=joliu
--HG--
rename : dom/bluetooth/bluetooth2/BluetoothCommon.h => dom/bluetooth/BluetoothCommon.h
2015-04-13 10:03:09 +02:00
Carsten "Tomcat" Book afcde79e15 Backed out changeset b3b4f6930b58 (bug 1152821) for bustage on a CLOSED TREE
--HG--
rename : dom/bluetooth/BluetoothCommon.h => dom/bluetooth/bluetooth2/BluetoothCommon.h
2015-04-10 15:29:39 +02:00
Carsten "Tomcat" Book e699c6d191 Backed out changeset eb14bd0103b6 (bug 1152821) 2015-04-10 15:29:00 +02:00
Thomas Zimmermann c102eb97fd Bug 1152821: Share BluetoothCommon.h between Bluetooth v1 and v2, r=joliu
This patch integrates changes from Bluetooth v1 into the shared file
BluetoothCommon.h, and makes it available to both versions.
2015-04-10 13:46:19 +02:00
Thomas Zimmermann e0727c2ae2 Bug 1152821: Move dom/bluetooth/bluetooth2/BluetoothCommon.h to dom/bluetooth, r=joliu
--HG--
rename : dom/bluetooth/bluetooth2/BluetoothCommon.h => dom/bluetooth/BluetoothCommon.h
2015-04-10 13:46:19 +02:00
Jocelyn Liu 17b99b7b84 Bug 1152702 - Fix upper bounds of ContiguousEnumSerializer for BluetoothStatus and BluetoothSspVariant. r=tzimmermann 2015-04-10 17:00:02 +08:00
Shawn Huang e2cbd26599 Bug 1152095 - Check mResultHandlerQ is empty before dispatching DispatchError. r=tzimmermann 2015-04-09 04:20:00 -04:00
Juan Gomez 74d291470d Bug 1087161 - Upgrading B2G toolchain to gcc-4.9
* Fixed some -Werror=format issues by making function-style castings

--HG--
extra : rebase_source : e9677c42819a8e95008bb3e97b97b47eff915021
2015-04-09 18:13:39 +02:00
Thomas Zimmermann c50cdfe9dd Bug 1146355: Prepare BlueZ for Bluetooth v2, r=brsun 2015-04-09 15:57:41 +02:00
Thomas Zimmermann bb712a3705 Bug 1146355: Prepare Bluetooth HFP manager, r=brsun 2015-04-09 15:57:41 +02:00
Thomas Zimmermann dde2e9fbf1 Bug 1146355: Prepare Bluetooth OPP manager, r=joliu 2015-04-09 15:57:41 +02:00
Thomas Zimmermann 7abceb7651 Bug 1146355: Prepare Bluetooth A2DP manager, r=joliu 2015-04-09 15:57:41 +02:00