OSDN Git Service
Jakub Pawlowski [Tue, 6 Jun 2017 21:53:24 +0000 (21:53 +0000)]
Get rid of trivial BTA_GATTC_ events am:
31a6bf4f11 am:
195f8c2599 am:
8984cf457f
am:
155ae3d0de
Change-Id: I60130937330d0aace504f42eb7effe91f7dd2a07
Jakub Pawlowski [Tue, 6 Jun 2017 21:39:58 +0000 (21:39 +0000)]
Get rid of trivial BTA_GATTC_ events am:
31a6bf4f11 am:
195f8c2599
am:
8984cf457f
Change-Id: I160733d1e62357d9785c3c7f31b1a3c962ef51ad
Jakub Pawlowski [Tue, 6 Jun 2017 21:25:53 +0000 (21:25 +0000)]
Get rid of trivial BTA_GATTC_ events am:
31a6bf4f11
am:
195f8c2599
Change-Id: Ice81eee5f60a28b960dd2139d79c998bc84f43e9
Jakub Pawlowski [Tue, 6 Jun 2017 21:20:43 +0000 (21:20 +0000)]
Get rid of trivial BTA_GATTC_ events
am:
31a6bf4f11
Change-Id: Id25b40895fae8722534e830f06532b62aac44d7b
Jakub Pawlowski [Mon, 5 Jun 2017 19:20:04 +0000 (12:20 -0700)]
Get rid of trivial BTA_GATTC_ events
Test: compilation test
Change-Id: I8c705d1bb0532cbe0dd69b1f3b0b5d1a63534a23
Jakub Pawlowski [Tue, 6 Jun 2017 20:57:27 +0000 (20:57 +0000)]
Initial DBus transport support am:
79c2ff968f am:
0c00f5664a am:
43ffbbe81f
am:
51393cd234
Change-Id: I73b7d89ffc568ad0e26dbe40be792b17631246f6
Jakub Pawlowski [Tue, 6 Jun 2017 20:57:14 +0000 (20:57 +0000)]
Fix order of parameters to BTA_GATTC_Open am:
11410a31b1
am:
8ebf607111
Change-Id: I4dc35b81cc939eeb7a9abc5d3f9b19751dfcb5bc
Jakub Pawlowski [Tue, 6 Jun 2017 20:55:46 +0000 (20:55 +0000)]
Initial DBus transport support am:
79c2ff968f am:
0c00f5664a
am:
43ffbbe81f
Change-Id: Id6150d77ca20f17ba6af59ef09b8efc8982f3250
Jakub Pawlowski [Tue, 6 Jun 2017 20:55:19 +0000 (20:55 +0000)]
Fix order of parameters to BTA_GATTC_Open
am:
11410a31b1
Change-Id: Id66d9c2503bc391911a09884d77a4fc4ea0f0bb2
Jakub Pawlowski [Tue, 6 Jun 2017 20:53:19 +0000 (20:53 +0000)]
Initial DBus transport support am:
79c2ff968f
am:
0c00f5664a
Change-Id: Icb9097f15cb87a5e864ad38fd2285161f57ae65d
Jakub Pawlowski [Tue, 6 Jun 2017 20:51:19 +0000 (20:51 +0000)]
Initial DBus transport support
am:
79c2ff968f
Change-Id: If2e1458120b318d983acbc50cf5f9653e17f03f5
Jakub Pawlowski [Mon, 31 Oct 2016 19:56:12 +0000 (12:56 -0700)]
Initial DBus transport support
This patch adds initial support for DBus transport on Linux. It exposes
initial implementation of Adapter that can be Enabled and Disabled. One
can also introspect the interface to find the exposed methods. Further
patches will extend it's functionality.
Test: ninja -C out/Default -j 40
Change-Id: I173cc752b8d8aaa8706ed36f75f5a043cc987b1a
Jakub Pawlowski [Tue, 6 Jun 2017 00:28:48 +0000 (00:28 +0000)]
Fix order of parameters to BTA_GATTC_Open am:
47474c3e58 am:
73275ae076 am:
3923f52175
am:
66570f8572
Change-Id: If261005ccd39e204abf1d0b2849afd44a2e4dec8
Jakub Pawlowski [Tue, 6 Jun 2017 00:16:50 +0000 (00:16 +0000)]
Fix order of parameters to BTA_GATTC_Open am:
47474c3e58 am:
73275ae076
am:
3923f52175
Change-Id: Id7001fa6be73111e26a29cef7acb8f2230a95806
Jakub Pawlowski [Tue, 6 Jun 2017 00:11:50 +0000 (00:11 +0000)]
Fix order of parameters to BTA_GATTC_Open am:
47474c3e58
am:
73275ae076
Change-Id: Iad0473d3cd1c6ef355c410b2fb50578856d24116
Jakub Pawlowski [Tue, 6 Jun 2017 00:06:50 +0000 (00:06 +0000)]
Fix order of parameters to BTA_GATTC_Open
am:
47474c3e58
Change-Id: I4a305269942e19b5a33521f3071cf24253db81c4
Jakub Pawlowski [Sat, 3 Jun 2017 23:39:04 +0000 (16:39 -0700)]
Fix order of parameters to BTA_GATTC_Open
Different order of parameters in different flavours of method caused
bug in btif_gatt_client.cc, where every client would be started as
opportunistic. This issue was introduced in commit
16bb48b320cde54a1a06a525f4d9be1421689649
Bug:
34951749
Test: sl4a GattReadTest was flaky without this patch
Change-Id: I243b11bd8e2c0da9f01cbd3eab95dc808bd54006
Jakub Pawlowski [Sat, 3 Jun 2017 23:39:04 +0000 (16:39 -0700)]
Fix order of parameters to BTA_GATTC_Open
Different order of parameters in different flavours of method caused
bug in btif_gatt_client.cc, where every client would be started as
opportunistic. This issue was introduced in commit
16bb48b320cde54a1a06a525f4d9be1421689649
Bug:
34951749
Test: sl4a GattReadTest was flaky without this patch
Change-Id: I243b11bd8e2c0da9f01cbd3eab95dc808bd54006
Jakub Pawlowski [Sat, 3 Jun 2017 02:43:19 +0000 (02:43 +0000)]
Pass GATT cb's by reference and other style fixes am:
f4c0292c63 am:
f5de435643 am:
75c8ce2a50
am:
1e76bd7e38
Change-Id: I6fc85537118159e1c8592baa14c08ba940ac3527
Jakub Pawlowski [Sat, 3 Jun 2017 02:43:16 +0000 (02:43 +0000)]
Use std::queue for pending_enc_clcb am:
eb3ab848f8 am:
8db401f92d am:
8395ce7081
am:
0d810425bf
Change-Id: I3d372d48ddc10d323b0b4de9a6aec458bbb996ff
Jakub Pawlowski [Sat, 3 Jun 2017 02:39:34 +0000 (02:39 +0000)]
Pass GATT cb's by reference and other style fixes am:
f4c0292c63 am:
f5de435643
am:
75c8ce2a50
Change-Id: Ia56eab5e39f6c374d4f6cc3263cab4083ac557f4
Jakub Pawlowski [Sat, 3 Jun 2017 02:39:31 +0000 (02:39 +0000)]
Use std::queue for pending_enc_clcb am:
eb3ab848f8 am:
8db401f92d
am:
8395ce7081
Change-Id: I5dc613353cb29ff39aa84228e2d142c369a2b0b1
Jakub Pawlowski [Sat, 3 Jun 2017 02:35:34 +0000 (02:35 +0000)]
Pass GATT cb's by reference and other style fixes am:
f4c0292c63
am:
f5de435643
Change-Id: Ib31990fdb1301bdba18c821b1a98709d80935ae1
Jakub Pawlowski [Sat, 3 Jun 2017 02:35:31 +0000 (02:35 +0000)]
Use std::queue for pending_enc_clcb am:
eb3ab848f8
am:
8db401f92d
Change-Id: I81e646cd0929fd5cc6bdd00fc3adb1c6aacf9f1b
Jakub Pawlowski [Sat, 3 Jun 2017 02:32:02 +0000 (02:32 +0000)]
Pass GATT cb's by reference and other style fixes
am:
f4c0292c63
Change-Id: Idac488cdb04185733e47f796a6bbac2c607e28fa
Jakub Pawlowski [Sat, 3 Jun 2017 02:32:00 +0000 (02:32 +0000)]
Use std::queue for pending_enc_clcb
am:
eb3ab848f8
Change-Id: Ia8a712f92f922818a5c68e8476864f535156a1b8
Jakub Pawlowski [Tue, 30 May 2017 18:21:04 +0000 (11:21 -0700)]
Pass GATT cb's by reference and other style fixes
Test: compilation test
Change-Id: I410d0d0a0bf49b9f3ca5e034c66fe8e82661cee7
Jakub Pawlowski [Tue, 30 May 2017 16:59:54 +0000 (09:59 -0700)]
Use std::queue for pending_enc_clcb
Test:
62188929
Change-Id: Ide07f15c5e5b6bc8b93ac350081b7bef7c7b3938
Sunny Kapdi [Fri, 2 Jun 2017 01:17:33 +0000 (01:17 +0000)]
Fix params of SetPeriodicAdvertisingParameters am:
0af739bcb4
am:
cb4fa74910
Change-Id: Iefa9f772b66513a081008825b47382d8f6907025
Sunny Kapdi [Fri, 2 Jun 2017 01:11:17 +0000 (01:11 +0000)]
Fix params of SetPeriodicAdvertisingParameters
am:
0af739bcb4
Change-Id: I9cda61113a2347ff778530cdabc254e14d367f52
Sunny Kapdi [Fri, 2 Jun 2017 00:35:09 +0000 (00:35 +0000)]
Fix params of SetPeriodicAdvertisingParameters am:
a85cb8ea67 am:
426325f728 am:
aa563f712e
am:
ff65e5c7aa
Change-Id: I219ca26ccc088409127d9ffaa3cfab35aed9fce1
Sunny Kapdi [Fri, 2 Jun 2017 00:21:42 +0000 (00:21 +0000)]
Fix params of SetPeriodicAdvertisingParameters am:
a85cb8ea67 am:
426325f728
am:
aa563f712e
Change-Id: Ia3871cc56f482c4c30252b0bbb5d780d58774e9c
Sunny Kapdi [Fri, 2 Jun 2017 00:18:42 +0000 (00:18 +0000)]
Fix params of SetPeriodicAdvertisingParameters am:
a85cb8ea67
am:
426325f728
Change-Id: Ia4f5af5a3f337123b872e6e2a94fcb21039cdd44
Sunny Kapdi [Fri, 2 Jun 2017 00:16:11 +0000 (00:16 +0000)]
Fix params of SetPeriodicAdvertisingParameters
am:
a85cb8ea67
Change-Id: I56a6b3cb07bc22afbe485476ae9bc79b8e68c7a6
Sunny Kapdi [Thu, 1 Jun 2017 21:34:03 +0000 (14:34 -0700)]
Fix params of SetPeriodicAdvertisingParameters
Fix the sequence of SetPeriodicAdvertisingParameters
in the hci_cmd
Bug:
62268713
Change-Id: Ibdcd362458e9d7ee2f95106a2aefa76e1c264103
Avish Shah [Thu, 1 Jun 2017 22:42:48 +0000 (22:42 +0000)]
Merge "GATT: Fixed typo while notifying connection update" into oc-dev am:
044e4c3de0
am:
a95bc5de74
Change-Id: I2fad95e3d2a389edeaf38c1bd09e704523c5b1f8
Avish Shah [Thu, 1 Jun 2017 22:39:02 +0000 (22:39 +0000)]
Merge "GATT: Fixed typo while notifying connection update" into oc-dev
am:
044e4c3de0
Change-Id: Idfa23fc3b466a57d1514a58ea6b18773a3fcfc49
TreeHugger Robot [Thu, 1 Jun 2017 22:36:18 +0000 (22:36 +0000)]
Merge "GATT: Fixed typo while notifying connection update" into oc-dev
Sunny Kapdi [Thu, 1 Jun 2017 21:34:03 +0000 (14:34 -0700)]
Fix params of SetPeriodicAdvertisingParameters
Fix the sequence of SetPeriodicAdvertisingParameters
in the hci_cmd
Bug:
62268713
Change-Id: Ibdcd362458e9d7ee2f95106a2aefa76e1c264103
Myles Watson [Thu, 1 Jun 2017 21:00:10 +0000 (21:00 +0000)]
Merge changes I90a48db4,I8b9815a0 into oc-dev am:
4d92cda9c7
am:
f97a090787
Change-Id: Iffc0917f7719cc5a82bda965332d00ebcc24122f
Myles Watson [Thu, 1 Jun 2017 20:56:44 +0000 (20:56 +0000)]
Merge changes I90a48db4,I8b9815a0 into oc-dev
am:
4d92cda9c7
Change-Id: I565e5ad59f8200393deeb359349b012c1cca9967
Avish Shah [Thu, 1 Jun 2017 20:56:25 +0000 (20:56 +0000)]
GATT: Fixed typo while notifying connection update am:
44a1c7eafb am:
5b707312f9 am:
3d3e8dd7bc
am:
f5a1d5e286
Change-Id: I4f93329742763b787cc8a95a17824cc5ed38307e
Avish Shah [Thu, 1 Jun 2017 20:50:55 +0000 (20:50 +0000)]
GATT: Fixed typo while notifying connection update am:
44a1c7eafb am:
5b707312f9
am:
3d3e8dd7bc
Change-Id: I0227edded7be640d427bee2a76f0803c2942ab9d
TreeHugger Robot [Thu, 1 Jun 2017 20:50:11 +0000 (20:50 +0000)]
Merge changes I90a48db4,I8b9815a0 into oc-dev
* changes:
HCI: Improve timeout handling
HCI: Get debug info from the firmware on timeout
Avish Shah [Thu, 1 Jun 2017 20:48:23 +0000 (20:48 +0000)]
GATT: Fixed typo while notifying connection update am:
44a1c7eafb
am:
5b707312f9
Change-Id: I82d5a6b6c5f7bc3a024d434555bb410113a470f7
Avish Shah [Thu, 1 Jun 2017 20:46:28 +0000 (20:46 +0000)]
GATT: Fixed typo while notifying connection update
am:
44a1c7eafb
Change-Id: I70cc6c866889d4328153c5170b564e12ab6a4b6a
Avish Shah [Wed, 31 May 2017 05:13:57 +0000 (10:43 +0530)]
GATT: Fixed typo while notifying connection update
Current conditions checks whether the app registered for
PHY_UPDATE instead it should check for CONN_UPDATE.
Bug:
62206018
Test: Manual
Change-Id: Ie9d068a24d13ea0b186b0ca874531aa4ffd1121f
(cherry picked from commit
44a1c7eafb2db9012c26dd622726655f19fbc0b7)
Avish Shah [Wed, 31 May 2017 05:13:57 +0000 (10:43 +0530)]
GATT: Fixed typo while notifying connection update
Current conditions checks whether the app registered for
PHY_UPDATE instead it should check for CONN_UPDATE.
Bug:
62206018
Test: Manual
Change-Id: Ie9d068a24d13ea0b186b0ca874531aa4ffd1121f
Yamei Du [Thu, 1 Jun 2017 07:57:23 +0000 (07:57 +0000)]
DO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am:
dae59d3b83 -s ours am:
0d0e9514ad -s ours am:
e6befb96a8 -s ours
am:
29d308097a -s ours
Change-Id: I89dd5fcdf778ab9fd1721d89154faa51ce95842b
Yamei Du [Thu, 1 Jun 2017 07:57:13 +0000 (07:57 +0000)]
DO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am:
dae59d3b83 -s ours am:
0d0e9514ad -s ours am:
40d02aabb5 -s ours
am:
9f5bcf0440 -s ours
Change-Id: I6bd32bfcdc6c4d5dde5edfe71314d422f291dc27
Yamei Du [Thu, 1 Jun 2017 07:52:36 +0000 (07:52 +0000)]
DO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am:
dae59d3b83 -s ours am:
0d0e9514ad -s ours
am:
e6befb96a8 -s ours
Change-Id: I61bf69bf501502d3adf7b2028e07d4da74d75768
Yamei Du [Thu, 1 Jun 2017 07:51:59 +0000 (07:51 +0000)]
DO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am:
dae59d3b83 -s ours am:
0d0e9514ad -s ours
am:
40d02aabb5 -s ours
Change-Id: I33cb779c17b49f2bdf5512d92d71950c71ee0754
Yamei Du [Thu, 1 Jun 2017 07:49:58 +0000 (07:49 +0000)]
DO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am:
dae59d3b83 -s ours
am:
0d0e9514ad -s ours
Change-Id: I37e10ab29d083a8d16e756caf3b094c188692d73
Yamei Du [Thu, 1 Jun 2017 07:49:58 +0000 (07:49 +0000)]
DO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX am:
dae59d3b83 -s ours
am:
0d0e9514ad -s ours
Change-Id: I81f931fc749ae4a9f149b6ddb183c282209e8e0c
Yamei Du [Thu, 1 Jun 2017 07:47:29 +0000 (07:47 +0000)]
DO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX
am:
dae59d3b83 -s ours
Change-Id: I2c48b9c67afda8ba35bfac258031de6909d1af12
Yamei Du [Wed, 18 Nov 2015 09:28:07 +0000 (17:28 +0800)]
DO NOT MERGE ANYWHERE HOGP mouse connect failed during OPP TX
FW ACL buffer overflow.
One more ACL packet was sent to FW which is unexpected.
fix l2cap TX control defect.
Call fixed channel TX complete cb after packets is send to lower.
Bug:
26763700
Tested: manual
Change-Id: Iaba14a11c1583da2a72769ebd096e0baedf857c3
CR-Id: ALPS02404396
Jack He [Wed, 31 May 2017 23:00:24 +0000 (23:00 +0000)]
Merge "HSP: Use peer_version during SCO setup" into oc-dev am:
d6850928b0
am:
6e5c00cefe
Change-Id: I85d288e7681ecd8f8deff9d4dfc4f3b68166205c
Jack He [Wed, 31 May 2017 22:58:24 +0000 (22:58 +0000)]
Merge "HSP: Use peer_version during SCO setup" into oc-dev
am:
d6850928b0
Change-Id: I2f0b67f0b3e4af86e0e99ab496bee7b2badd8bff
TreeHugger Robot [Wed, 31 May 2017 22:54:03 +0000 (22:54 +0000)]
Merge "HSP: Use peer_version during SCO setup" into oc-dev
Myles Watson [Wed, 24 May 2017 20:16:40 +0000 (13:16 -0700)]
HCI: Improve timeout handling
Remove pending commands before enqueueing new ones and log all
pending commands when there is a timeout.
Bug:
37298084
Test: set the timeout to 20ms
Change-Id: I90a48db46a78f75dd78e468ee2d5c948afc1850e
(cherry picked from commit
4788821a0b3c47645deacb3b0047addf192956e2)
Myles Watson [Tue, 9 May 2017 23:50:00 +0000 (16:50 -0700)]
HCI: Get debug info from the firmware on timeout
Bug:
37298084
Test: set the timeout to 20ms
Change-Id: I8b9815a03a15dcb6ce78c0692874b55cb4fc07bc
(cherry picked from commit
2bfb56a2a92c897c8c0648674c51197fa8fe7f0a)
Myles Watson [Wed, 31 May 2017 19:46:18 +0000 (19:46 +0000)]
HCI: Improve timeout handling am:
4788821a0b am:
5540318111 am:
e41a7509e6
am:
1147b7443c
Change-Id: I17c0eead5613e8f7fad551e509605b4caddef749
Myles Watson [Wed, 31 May 2017 19:46:04 +0000 (19:46 +0000)]
HCI: Get debug info from the firmware on timeout am:
2bfb56a2a9 am:
ecb5b9bf3e am:
e9a5b7563b
am:
bb6cd314d4
Change-Id: Idd62eacff3d60e03d2effb81a228043b5335f3f1
Myles Watson [Wed, 31 May 2017 19:41:00 +0000 (19:41 +0000)]
HCI: Improve timeout handling am:
4788821a0b am:
5540318111
am:
e41a7509e6
Change-Id: I9964c5a9db4dea8a2f037a2974d8605135b8d1f4
Myles Watson [Wed, 31 May 2017 19:36:24 +0000 (19:36 +0000)]
HCI: Get debug info from the firmware on timeout am:
2bfb56a2a9 am:
ecb5b9bf3e
am:
e9a5b7563b
Change-Id: Ic676c5889b59e12d1661d5b1ee2ef4650510627a
Myles Watson [Wed, 31 May 2017 19:36:23 +0000 (19:36 +0000)]
HCI: Improve timeout handling am:
4788821a0b
am:
5540318111
Change-Id: I657b24b17171291efb90afee0c6c17d3ea403c6b
Myles Watson [Wed, 31 May 2017 19:32:26 +0000 (19:32 +0000)]
HCI: Improve timeout handling
am:
4788821a0b
Change-Id: I62191cdfa16e25bccc634b2a63dad938e5addd5b
Myles Watson [Wed, 31 May 2017 19:32:26 +0000 (19:32 +0000)]
HCI: Get debug info from the firmware on timeout am:
2bfb56a2a9
am:
ecb5b9bf3e
Change-Id: I5832ba3e1c04aa41cf7bfed792d5825748c8c0fd
Myles Watson [Wed, 31 May 2017 19:28:24 +0000 (19:28 +0000)]
HCI: Get debug info from the firmware on timeout
am:
2bfb56a2a9
Change-Id: Ib6853df8cf6f07707d5531719c10bd68d86211a1
Myles Watson [Wed, 24 May 2017 20:16:40 +0000 (13:16 -0700)]
HCI: Improve timeout handling
Remove pending commands before enqueueing new ones and log all
pending commands when there is a timeout.
Bug:
37298084
Test: set the timeout to 20ms
Change-Id: I90a48db46a78f75dd78e468ee2d5c948afc1850e
Myles Watson [Tue, 9 May 2017 23:50:00 +0000 (16:50 -0700)]
HCI: Get debug info from the firmware on timeout
Bug:
37298084
Test: set the timeout to 20ms
Change-Id: I8b9815a03a15dcb6ce78c0692874b55cb4fc07bc
TreeHugger Robot [Wed, 31 May 2017 03:36:15 +0000 (03:36 +0000)]
Merge "HFP: Enable in-band ringing by default (2/2)"
Myles Watson [Wed, 31 May 2017 02:03:48 +0000 (02:03 +0000)]
Merge "GATT: Interop fix for service changed indications" into oc-dev am:
3b5c89a70b
am:
1a5c8b2af4
Change-Id: I1a06fbef19d77b52fd61b7d385db32a8c5b0975f
Myles Watson [Wed, 31 May 2017 01:59:16 +0000 (01:59 +0000)]
Merge "GATT: Interop fix for service changed indications" into oc-dev
am:
3b5c89a70b
Change-Id: Iefdbe711a8ffbadd53e24c44697b9a1a4c0a3734
TreeHugger Robot [Wed, 31 May 2017 01:51:34 +0000 (01:51 +0000)]
Merge "GATT: Interop fix for service changed indications" into oc-dev
Ruina Liu [Wed, 31 May 2017 00:54:17 +0000 (00:54 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist am:
e90e72bb82 -s ours am:
c139d021b2 -s ours am:
75f2b19b28 -s ours" into oc-dev-plus-aosp
am:
791ee1fb82 -s ours
Change-Id: Id0d22a37b0b9caf6c7bc456789c75022603a8e18
Ruina Liu [Wed, 31 May 2017 00:54:05 +0000 (00:54 +0000)]
DO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist am:
e90e72bb82 -s ours am:
c139d021b2 -s ours am:
26d7a28ed1 -s ours
am:
5ebab45ca5 -s ours
Change-Id: Iddf23919f509d0f51b27e2dd795b91cc9e55eb57
Android Build Merger (Role) [Wed, 31 May 2017 00:46:20 +0000 (00:46 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist am:
e90e72bb82 -s ours am:
c139d021b2 -s ours am:
75f2b19b28 -s ours" into oc-dev-plus-aosp
Ruina Liu [Wed, 31 May 2017 00:46:15 +0000 (00:46 +0000)]
DO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist am:
e90e72bb82 -s ours am:
c139d021b2 -s ours
am:
75f2b19b28 -s ours
Change-Id: I037a7a68bd70a1e9bc2a84a8f6e22d0fd1458526
Ruina Liu [Wed, 31 May 2017 00:46:10 +0000 (00:46 +0000)]
DO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist am:
e90e72bb82 -s ours am:
c139d021b2 -s ours
am:
26d7a28ed1 -s ours
Change-Id: I6d75f421f9363291c894a61435f8ac1c5ae09f62
Ruina Liu [Wed, 31 May 2017 00:42:10 +0000 (00:42 +0000)]
DO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist am:
e90e72bb82 -s ours
am:
c139d021b2 -s ours
Change-Id: I5c70d7e288f401cfef7de9f93ed9ed8366ee7914
Ruina Liu [Wed, 31 May 2017 00:42:09 +0000 (00:42 +0000)]
DO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist am:
e90e72bb82 -s ours
am:
c139d021b2 -s ours
Change-Id: Iff016ad67d9c076a6a877d9f2f35e10971861620
Ruina Liu [Wed, 31 May 2017 00:38:38 +0000 (00:38 +0000)]
DO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist
am:
e90e72bb82 -s ours
Change-Id: Iee3ecc2a5c6d81a4fc2e72e8e21cd0d898199624
Ruina Liu [Thu, 24 Sep 2015 02:04:16 +0000 (10:04 +0800)]
DO NOT MERGE ANYWHERE Fix connect second BLE fail while BREDR coexist
In scenario where BREDR/BLE links coexist, and BLE
transport is doing round-robin but BREDR transport is
not use round-robin, when uplayer trigger to transmit
BLE data, the BREDR lcb_pool with smaller array index
will break the for loop firstly. This can block the
L2cap packets transmission of the following BLE lcb_pool
even though there is available BLE controller buffer.
If BLE_INCLUDE is TRUE, then BREDR/BLE links maybe
coexist, change break to continue statement, so the
data transmission will not be blocked by the other
transport type in round-robin case.
Change-Id: I7ca739dfbf02acd2e30527c16ca616a7bad70c51
CR-Id: ALPS02303646
Jakub Pawlowski [Tue, 30 May 2017 22:57:53 +0000 (22:57 +0000)]
Get rid of unused tGATT_SCCB am:
8663a87ea0 am:
5f0437a072 am:
dc0cc50dce
am:
a831d9a6a5
Change-Id: I47ffd7176bb32a239bb7edd885571a9ad1b7f345
Jakub Pawlowski [Tue, 30 May 2017 22:54:22 +0000 (22:54 +0000)]
Get rid of unused tGATT_SCCB am:
8663a87ea0 am:
5f0437a072
am:
dc0cc50dce
Change-Id: Iaecd25666e1dcf6cf49880507d717407aa60158c
Jakub Pawlowski [Tue, 30 May 2017 22:49:35 +0000 (22:49 +0000)]
Get rid of unused tGATT_SCCB am:
8663a87ea0
am:
5f0437a072
Change-Id: Ie76765b915100ba31447bbb4eb729aeac4a527ca
Jakub Pawlowski [Tue, 30 May 2017 22:41:17 +0000 (22:41 +0000)]
Get rid of unused tGATT_SCCB
am:
8663a87ea0
Change-Id: I0b87a463e12d0487f7e827eee581fa132a246fba
Jack He [Tue, 30 May 2017 22:15:21 +0000 (15:15 -0700)]
HFP: Enable in-band ringing by default (2/2)
Bug:
19171297
Test: make, make calls, HFP regression
Change-Id: I8ace78f7550c7d0856a0e0369b02b45deeb7d5c0
Andre Eisenbach [Tue, 30 May 2017 21:19:52 +0000 (21:19 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb" into cw-f-dev am:
b044bae800 -s ours am:
310ce8b220 -s ours am:
1917615840 -s ours" into oc-dev-plus-aosp
am:
d3c5f68ecc -s ours
Change-Id: Ic40f5ad387a154204c821a12b53a324fcfca5bb0
Andre Eisenbach [Tue, 30 May 2017 21:19:37 +0000 (21:19 +0000)]
Merge "DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb" into cw-f-dev am:
b044bae800 -s ours am:
310ce8b220 -s ours am:
e5b1643eef -s ours
am:
5b0feb85a1 -s ours
Change-Id: I2b40f4919f0329789d27875c5627a8ebe34bc2fb
Android Build Merger (Role) [Tue, 30 May 2017 21:15:08 +0000 (21:15 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb" into cw-f-dev am:
b044bae800 -s ours am:
310ce8b220 -s ours am:
1917615840 -s ours" into oc-dev-plus-aosp
Andre Eisenbach [Tue, 30 May 2017 21:14:56 +0000 (21:14 +0000)]
Merge "DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb" into cw-f-dev am:
b044bae800 -s ours am:
310ce8b220 -s ours
am:
e5b1643eef -s ours
Change-Id: If5e96750e5defb151af47695ffa32770aeeb2926
Andre Eisenbach [Tue, 30 May 2017 21:14:55 +0000 (21:14 +0000)]
Merge "DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb" into cw-f-dev am:
b044bae800 -s ours am:
310ce8b220 -s ours
am:
1917615840 -s ours
Change-Id: I91ce7e6383929bec27e0acc2d9544e6478495f22
Andre Eisenbach [Tue, 30 May 2017 21:10:55 +0000 (21:10 +0000)]
Merge "DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb" into cw-f-dev am:
b044bae800 -s ours
am:
310ce8b220 -s ours
Change-Id: Ic13bec3228eebc49d2cf82ecc6f2eee4156a31ef
Andre Eisenbach [Tue, 30 May 2017 21:10:55 +0000 (21:10 +0000)]
Merge "DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb" into cw-f-dev am:
b044bae800 -s ours
am:
310ce8b220 -s ours
Change-Id: I7d82f8364fd0958ced81d4696dfc5fd8d7bb0955
Andre Eisenbach [Tue, 30 May 2017 21:06:25 +0000 (21:06 +0000)]
Merge "DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb" into cw-f-dev
am:
b044bae800 -s ours
Change-Id: Ic7314f6710c10c670ea3a4a24b4865661ee1451e
TreeHugger Robot [Tue, 30 May 2017 21:00:28 +0000 (21:00 +0000)]
Merge "DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb" into cw-f-dev
Jakub Pawlowski [Sat, 27 May 2017 01:51:27 +0000 (18:51 -0700)]
Get rid of unused tGATT_SCCB
Test: compilation test
Change-Id: I32fee6a93442c8415f7d855c1e4802bceb6fe5ff
Andre Eisenbach [Thu, 3 Nov 2016 21:53:49 +0000 (14:53 -0700)]
DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb
|data| may be NULL if the RSSI request times out.
See btm_read_rssi_timeout implementation for details.
Bug:
32587130
Test: manual
Change-Id: Ide9dee819e1db24a39c05b086cd4c0b558ca23ef
OSDN Git Service
