OSDN Git Service

android-x86/system-bt.git
7 years agotest_vendor: Stop watching before closing the FD am: 01ce9e4233
Myles Watson [Wed, 15 Mar 2017 22:39:33 +0000 (22:39 +0000)]
test_vendor: Stop watching before closing the FD am: 01ce9e4233
am: 3f8516d7cc

Change-Id: I5d2fba1b8aa8ba15b1de8d2425c882d6ef550f5e

7 years agotest_vendor: Stop watching before closing the FD
Myles Watson [Wed, 15 Mar 2017 22:37:02 +0000 (22:37 +0000)]
test_vendor: Stop watching before closing the FD
am: 01ce9e4233

Change-Id: I5c8efd21cfbaf45677a8e29c617852f7f10a768b

7 years agotest_vendor: Stop watching before closing the FD
Myles Watson [Wed, 15 Mar 2017 19:14:36 +0000 (12:14 -0700)]
test_vendor: Stop watching before closing the FD

Test: net_test_bluetooth BluetoothTest.AdapterRepeatedEnableDisable
Change-Id: I72f5c9105b535ad5a5c41bc15dc9a3ad5f4e023f

7 years agoFix bta_dm_act.cc compile error. am: 7651cfbe6a
Alex Deymo [Wed, 15 Mar 2017 14:21:50 +0000 (14:21 +0000)]
Fix bta_dm_act.cc compile error. am: 7651cfbe6a
am: 3544bacb2a

Change-Id: I7f154b88648845cb930835d11ed79245d8989804

7 years agoFix bta_dm_act.cc compile error.
Alex Deymo [Wed, 15 Mar 2017 14:16:20 +0000 (14:16 +0000)]
Fix bta_dm_act.cc compile error.
am: 7651cfbe6a

Change-Id: Ie57643e2919cddb74151d471891c6eed93899103

7 years agoFix bta_dm_act.cc compile error.
Alex Deymo [Wed, 15 Mar 2017 07:16:58 +0000 (00:16 -0700)]
Fix bta_dm_act.cc compile error.

When BTM_LOCAL_IO_CAPS == BTM_IO_CAP_NONE the code fails to compile due
to a missing comma. This was introducted a couple of months ago by
2e8e9f42132d0297a94c0852a1fbf45c9bc348e5 but it went undetected.

This patch simply adds back the missing comma.

Bug: 35804180
Test: `make` on a device with BTM_LOCAL_IO_CAPS set to BTM_IO_CAP_NONE.
Change-Id: I0a924abec4fe6612c5dbb72416123ca391551523

7 years agoresolve merge conflicts of a3ee2e35 to nyc-dev am: a33dd28064 am: b75b8e7f1a am:...
Pavlin Radoslavov [Wed, 15 Mar 2017 06:09:23 +0000 (06:09 +0000)]
resolve merge conflicts of a3ee2e35 to nyc-dev am: a33dd28064 am: b75b8e7f1a am: d4f1f0e048 am: 0796aaa047
am: b4e34476e9  -s ours

Change-Id: I5fe69742472d5a419f6757fbb64df0099cf53748

7 years agoCheck the HCI length before extracting the L2CAP length and CID
Pavlin Radoslavov [Wed, 8 Mar 2017 02:48:21 +0000 (18:48 -0800)]
Check the HCI length before extracting the L2CAP length and CID

Bug: 34946955
Test: A2DP streaming to a headset
Change-Id: I0b6f50dee05a58db8c043b4d01fb58c9acbeede9
(cherry picked from commit ecc0835114cbae3033d8b0e25bd8b443880d5077)
(cherry picked from commit 33c68c82c1a9c2436d203250ab82f5361ff905b7)
(cherry picked from commit a4c029c7887d0df70c0d6a884a861eb63d827603)

7 years agoresolve merge conflicts of a3ee2e35 to nyc-dev am: a33dd28064 am: b75b8e7f1a am:...
Pavlin Radoslavov [Wed, 15 Mar 2017 05:58:21 +0000 (05:58 +0000)]
resolve merge conflicts of a3ee2e35 to nyc-dev am: a33dd28064 am: b75b8e7f1a am: d4f1f0e048
am: 0796aaa047

Change-Id: I216fb8bc48e84793e3c397c60f4311796ce5ef83

7 years agoresolve merge conflicts of a3ee2e35 to nyc-dev am: a33dd28064 am: b75b8e7f1a
Pavlin Radoslavov [Wed, 15 Mar 2017 05:53:21 +0000 (05:53 +0000)]
resolve merge conflicts of a3ee2e35 to nyc-dev am: a33dd28064 am: b75b8e7f1a
am: d4f1f0e048

Change-Id: Id111ef66d83a3427ccc8272115ef3191221ee3cc

7 years agoresolve merge conflicts of a3ee2e35 to nyc-dev am: a33dd28064
Pavlin Radoslavov [Wed, 15 Mar 2017 05:47:20 +0000 (05:47 +0000)]
resolve merge conflicts of a3ee2e35 to nyc-dev am: a33dd28064
am: b75b8e7f1a

Change-Id: Iab4d37c1e43d62d9132ebf090ac43284f8b668a8

7 years agoresolve merge conflicts of a3ee2e35 to nyc-dev
Pavlin Radoslavov [Wed, 15 Mar 2017 05:41:49 +0000 (05:41 +0000)]
resolve merge conflicts of a3ee2e35 to nyc-dev
am: a33dd28064

Change-Id: I081f113d8908bb775f56c25beb105a3311b0affb

7 years agoresolve merge conflicts of a3ee2e35 to nyc-dev
Pavlin Radoslavov [Tue, 14 Mar 2017 21:46:15 +0000 (14:46 -0700)]
resolve merge conflicts of a3ee2e35 to nyc-dev

Bug: 34946955
Change-Id: Ieff690edd3aa527a0639483ec8e1e3b661f0ecc4
Merged-In: I0b6f50dee05a58db8c043b4d01fb58c9acbeede9

7 years agoMerge "Add a log message in the beginning of function hci_initialize()" am: e745f573f6
Pavlin Radoslavov [Wed, 15 Mar 2017 01:18:42 +0000 (01:18 +0000)]
Merge "Add a log message in the beginning of function hci_initialize()" am: e745f573f6
am: c46a058a2b

Change-Id: Ibbbbba54ea8ce151f4771495453b0db6bf2f412d

7 years agoMerge "Add a log message in the beginning of function hci_initialize()"
Pavlin Radoslavov [Wed, 15 Mar 2017 01:14:12 +0000 (01:14 +0000)]
Merge "Add a log message in the beginning of function hci_initialize()"
am: e745f573f6

Change-Id: Ia9fa15a85c64c297b911449594b6daf5b8871c0e

7 years agoParse extended advertising packets am: d6d64b11e1
Jakub Pawlowski [Wed, 15 Mar 2017 01:09:35 +0000 (01:09 +0000)]
Parse extended advertising packets am: d6d64b11e1
am: 21c92ccbd7

Change-Id: I9ffa0c57b5bb18d44613e9fb0dcab58a9f68c72f

7 years agoMerge "Add a log message in the beginning of function hci_initialize()"
Treehugger Robot [Wed, 15 Mar 2017 01:08:24 +0000 (01:08 +0000)]
Merge "Add a log message in the beginning of function hci_initialize()"

7 years agoParse extended advertising packets
Jakub Pawlowski [Wed, 15 Mar 2017 01:05:04 +0000 (01:05 +0000)]
Parse extended advertising packets
am: d6d64b11e1

Change-Id: I05c290d1d441f56eac28ffdff8ed7b4795061dc3

7 years agoAdd "LE Remove Advertising Set Command" am: bb858fbf93
Jakub Pawlowski [Wed, 15 Mar 2017 00:55:52 +0000 (00:55 +0000)]
Add "LE Remove Advertising Set Command" am: bb858fbf93
am: 9fcca39bcb

Change-Id: I35065a6ce06b53ce453dc1d33dbdd76077718162

7 years agoAdd "LE Remove Advertising Set Command"
Jakub Pawlowski [Wed, 15 Mar 2017 00:50:52 +0000 (00:50 +0000)]
Add "LE Remove Advertising Set Command"
am: bb858fbf93

Change-Id: I3157d266f0e454bcc46a10b4e7cea9f2018179c9

7 years agoParse extended advertising packets
Jakub Pawlowski [Mon, 13 Mar 2017 23:09:35 +0000 (16:09 -0700)]
Parse extended advertising packets

Test: manual
Bug: 30622771
Change-Id: I286b8d636115385ee5951284629a1894026d9b5b

7 years agoAdd a log message in the beginning of function hci_initialize()
Pavlin Radoslavov [Sat, 11 Mar 2017 04:51:45 +0000 (20:51 -0800)]
Add a log message in the beginning of function hci_initialize()

Bug: 36043456
Test: Code compilation
Change-Id: Ib588c95a64100f5b2b3567f1bac9fe5e9160e4c0

7 years agoAdd "LE Remove Advertising Set Command"
Jakub Pawlowski [Sun, 12 Mar 2017 00:40:52 +0000 (16:40 -0800)]
Add "LE Remove Advertising Set Command"

Bug: 30622771
Test: manual
Change-Id: Ie0df73475359c69af8df672454fe0c0374523c88

7 years agoCheck the HCI length before extracting the L2CAP length and CID am: 33c68c82c1 am...
Pavlin Radoslavov [Tue, 14 Mar 2017 21:10:16 +0000 (21:10 +0000)]
Check the HCI length before extracting the L2CAP length and CID am: 33c68c82c1 am: 172f0d8f7c
am: ca64d3d38b

Change-Id: I239b72b4cc81728c3e859b7f4efcb820c9d8fef9

7 years agohci: Stop the thread before hci_close() am: e986c934fd
Myles Watson [Tue, 14 Mar 2017 21:05:18 +0000 (21:05 +0000)]
hci: Stop the thread before hci_close() am: e986c934fd
am: af23b6aeb7

Change-Id: Ic39449b6f6551546b5e748e035fb87b5561450f5

7 years agoCheck the HCI length before extracting the L2CAP length and CID am: 33c68c82c1
Pavlin Radoslavov [Tue, 14 Mar 2017 21:05:16 +0000 (21:05 +0000)]
Check the HCI length before extracting the L2CAP length and CID am: 33c68c82c1
am: 172f0d8f7c

Change-Id: Ifb002936f93d85d635ab76ddf52c0ddb44cb9d3e

7 years agohci: Stop the thread before hci_close()
Myles Watson [Tue, 14 Mar 2017 20:59:47 +0000 (20:59 +0000)]
hci: Stop the thread before hci_close()
am: e986c934fd

Change-Id: I639ddc9eb768a260186e06ea03d49c1d2c76f929

7 years agoCheck the HCI length before extracting the L2CAP length and CID
Pavlin Radoslavov [Tue, 14 Mar 2017 20:59:46 +0000 (20:59 +0000)]
Check the HCI length before extracting the L2CAP length and CID
am: 33c68c82c1

Change-Id: I1f94530ef90162747ef6a62c3a601856ea1d6672

7 years agoCheck the HCI length before extracting the L2CAP length and CID
Pavlin Radoslavov [Wed, 8 Mar 2017 02:48:21 +0000 (18:48 -0800)]
Check the HCI length before extracting the L2CAP length and CID

Bug: 34946955
Test: A2DP streaming to a headset
Change-Id: I0b6f50dee05a58db8c043b4d01fb58c9acbeede9
(cherry picked from commit ecc0835114cbae3033d8b0e25bd8b443880d5077)

7 years agohci: Stop the thread before hci_close()
Myles Watson [Tue, 14 Mar 2017 18:58:10 +0000 (11:58 -0700)]
hci: Stop the thread before hci_close()

Bug:36026072
Test: Switch users (toggle Bluetooth under load)
Change-Id: I3fb901b5c47021c708c1fb548858406225065d00

7 years agoLE Periodic Advertising - advertiser interface am: 8e774d1c53
Lakshmipathi K [Mon, 13 Mar 2017 19:55:16 +0000 (19:55 +0000)]
LE Periodic Advertising - advertiser interface am: 8e774d1c53
am: 4cc0683bd3

Change-Id: Ic58562c45d8f9336664afb6d143b94ae90c40c2b

7 years agoLE Periodic Advertising - advertiser interface
Lakshmipathi K [Mon, 13 Mar 2017 19:50:50 +0000 (19:50 +0000)]
LE Periodic Advertising - advertiser interface
am: 8e774d1c53

Change-Id: I36db1a34639b5cb8deb5ad9a82439ebad15ed038

7 years agoLE Periodic Advertising - advertiser interface
Lakshmipathi K [Mon, 13 Mar 2017 17:35:12 +0000 (10:35 -0700)]
LE Periodic Advertising - advertiser interface

Bug: 30622771
Test: manual
Change-Id: I358b872c9ffb52f007db4f111520c05b9521aa7f

7 years agoMerge "Bluetooth 5 feature check implementation (1/3)" am: 70af00d710
Jakub Pawlowski [Sat, 11 Mar 2017 02:16:54 +0000 (02:16 +0000)]
Merge "Bluetooth 5 feature check implementation (1/3)" am: 70af00d710
am: e33a64ca15

Change-Id: Ia91caf0ccae12c4acd46d20b81ded054447063e6

7 years agoMerge "Bluetooth 5 feature check implementation (1/3)"
Jakub Pawlowski [Sat, 11 Mar 2017 02:13:22 +0000 (02:13 +0000)]
Merge "Bluetooth 5 feature check implementation (1/3)"
am: 70af00d710

Change-Id: I3a845460853a519ed9d870d579a71ee3fe887f7e

7 years agoMerge "Bluetooth 5 feature check implementation (1/3)"
Treehugger Robot [Sat, 11 Mar 2017 02:03:42 +0000 (02:03 +0000)]
Merge "Bluetooth 5 feature check implementation (1/3)"

7 years agohci: Close the HAL before cleaning up pending command queue and timers am: d696e66cad
Myles Watson [Sat, 11 Mar 2017 00:49:07 +0000 (00:49 +0000)]
hci: Close the HAL before cleaning up pending command queue and timers am: d696e66cad
am: c6dbb2369b

Change-Id: I4e21148c63befe059f613594e0c2eaaa4f4faa1b

7 years agohci: Close the HAL before cleaning up pending command queue and timers
Myles Watson [Sat, 11 Mar 2017 00:45:36 +0000 (00:45 +0000)]
hci: Close the HAL before cleaning up pending command queue and timers
am: d696e66cad

Change-Id: I5913c210da826c4cebef0b03478afe4f0c49a771

7 years agohci: Close the HAL before cleaning up pending command queue and timers
Myles Watson [Fri, 10 Mar 2017 21:08:59 +0000 (13:08 -0800)]
hci: Close the HAL before cleaning up pending command queue and timers

This prevents errors in case of event callbacks being received or timers
being fired after the pending command queue has been deleted.

Bug: 36026072
Test: Turn Bluetooth off/on while scanning and file transfer
Change-Id: I7bb699e929a8b40e42a3543b5445885ae6b1b975

7 years agoBluetooth 5 feature check implementation (1/3)
Jakub Pawlowski [Fri, 10 Mar 2017 02:11:43 +0000 (18:11 -0800)]
Bluetooth 5 feature check implementation (1/3)

Wire the new feature check API to actual values received from the
controller.

Test: manual
Bug: 30622771
Change-Id: I2eefb7d5bb00d89ac7ea803191ba05f830080ade

7 years agosmp_keys simplification am: e76a01e1a7
Jakub Pawlowski [Wed, 8 Mar 2017 20:17:16 +0000 (20:17 +0000)]
smp_keys simplification am: e76a01e1a7
am: b89568baf4

Change-Id: I3239ecc555586da8f31a8e00b51aaf76cd2e7bee

7 years agosmp_keys simplification
Jakub Pawlowski [Wed, 8 Mar 2017 20:15:14 +0000 (20:15 +0000)]
smp_keys simplification
am: e76a01e1a7

Change-Id: I7c7a2f0e2f6c27a135daaa381fca342fe61c4c72

7 years agosmp_keys simplification
Jakub Pawlowski [Fri, 24 Feb 2017 18:57:57 +0000 (10:57 -0800)]
smp_keys simplification

Test: manual
Change-Id: Ia38604d496b8ae50934c42b68f2424afd1c6320c

7 years agohci: Reduce HCI timeout to 2 seconds am: fb94dc76eb
Myles Watson [Tue, 7 Mar 2017 02:38:42 +0000 (02:38 +0000)]
hci: Reduce HCI timeout to 2 seconds am: fb94dc76eb
am: c3c4158905

Change-Id: I5347fcdd94752b609e944e48aa06a04865c937bf

7 years agohci: Reduce HCI timeout to 2 seconds
Myles Watson [Tue, 7 Mar 2017 02:36:12 +0000 (02:36 +0000)]
hci: Reduce HCI timeout to 2 seconds
am: fb94dc76eb

Change-Id: Ia26374f62252fe1133cb4129906618b6647fc98d

7 years agohci: Reduce HCI timeout to 2 seconds
Myles Watson [Mon, 6 Mar 2017 17:07:37 +0000 (09:07 -0800)]
hci: Reduce HCI timeout to 2 seconds

Test: Bluetooth starts/stops, Bluetooth scan works
Change-Id: I4b04d71d57f45956898ff1a99e495195b54f4e8e

7 years agoFix for dual-mode devices advertising with a single address am: 8bf2285959
Jack He [Thu, 2 Mar 2017 20:46:09 +0000 (20:46 +0000)]
Fix for dual-mode devices advertising with a single address am: 8bf2285959
am: a6b062d422

Change-Id: Id38e6e39b21f40f83196c76209974bf7ad3d691f

7 years agoFix for dual-mode devices advertising with a single address
Jack He [Thu, 2 Mar 2017 20:43:38 +0000 (20:43 +0000)]
Fix for dual-mode devices advertising with a single address
am: 8bf2285959

Change-Id: I9b36a3a38f6b7e943dafea354bd32b7730589da5

7 years agoFix for dual-mode devices advertising with a single address
Jack He [Thu, 16 Feb 2017 08:06:15 +0000 (03:06 -0500)]
Fix for dual-mode devices advertising with a single address

* BTM_ReadRemoteDeviceName checks if a device is connectable over LE before
  making a connection. However, when it is not connectable over LE, it could
  be connectable over BR/EDR.
* For Dual Mode device, the device type should be 0x3 and is not equal to
  BT_DEVICE_TYPE_BREDR, hence we cannot check equality to determine whether
  a device is BR/EDR, but need to AND them and check the result.
* btm_ble_read_remote_name() already checks if device is connectable in LE,
  and we do not need to do it in BTM_ReadRemoteDeviceName().
* This fix removes the check from BTM_ReadRemoteDeviceName
* This fix also adds error checking to return values of BTM_ReadRemoteDeviceName
* This fix moves inquiry database query to respective remote name
  request procedures, as the result of the query is used in those
  procedures instead of in BTM_ReadRemoteDeviceName()

Bug: 35348392
Test: make, pair with device that advertise on both LE and BR/EDR
Change-Id: I10d1aa9dd6e2447f9b9d40b1fea9370b5088a57d

7 years agoMerge "cleanup: no assigns in conditionals" am: 20d25f4a11
Marie Janssen [Thu, 2 Mar 2017 17:11:23 +0000 (17:11 +0000)]
Merge "cleanup: no assigns in conditionals" am: 20d25f4a11
am: b348392652

Change-Id: I9ad89e2788b4a95e0f896daa8a6530a313e67ad5

7 years agoMerge "cleanup: no assigns in conditionals"
Marie Janssen [Thu, 2 Mar 2017 17:08:53 +0000 (17:08 +0000)]
Merge "cleanup: no assigns in conditionals"
am: 20d25f4a11

Change-Id: Id6c9397753e2c971b21c5a08562d8228d6edeb9e

7 years agoMerge "cleanup: no assigns in conditionals"
Treehugger Robot [Thu, 2 Mar 2017 17:05:10 +0000 (17:05 +0000)]
Merge "cleanup: no assigns in conditionals"

7 years agoDisable broken unittest am: 042ac33ca2
Bailey Forrest [Wed, 1 Mar 2017 23:00:34 +0000 (23:00 +0000)]
Disable broken unittest am: 042ac33ca2
am: a334dd605e

Change-Id: Ibf6369cb548e06ed77e7ad98d4c2b2901f19444a

7 years agoDisable broken unittest
Bailey Forrest [Wed, 1 Mar 2017 22:55:36 +0000 (22:55 +0000)]
Disable broken unittest
am: 042ac33ca2

Change-Id: I133b3c9b8a2df18b1497c0a561bcfdbc7ea4cee6

7 years agoDisable broken unittest
Bailey Forrest [Wed, 1 Mar 2017 19:49:14 +0000 (11:49 -0800)]
Disable broken unittest

Change-Id: I9c7dbd8dfdb440a31e4c98e93ee533fe96ee7b0e

7 years agoAllow framework to compile with BTM_IO_CAP_NONE am: eb1ad1d47b
Pulkit Bhuwalka [Wed, 1 Mar 2017 18:55:50 +0000 (18:55 +0000)]
Allow framework to compile with BTM_IO_CAP_NONE am: eb1ad1d47b
am: 99baf8d4b6

Change-Id: I6d7b38b0293ed45c5d7bf1494525e952b0c62421

7 years agoAllow framework to compile with BTM_IO_CAP_NONE
Pulkit Bhuwalka [Wed, 1 Mar 2017 18:53:19 +0000 (18:53 +0000)]
Allow framework to compile with BTM_IO_CAP_NONE
am: eb1ad1d47b

Change-Id: I082341c0e500cb8bf4e19e2886fbb19cd1d16cfc

7 years agoAllow framework to compile with BTM_IO_CAP_NONE
Pulkit Bhuwalka [Wed, 1 Mar 2017 00:11:34 +0000 (16:11 -0800)]
Allow framework to compile with BTM_IO_CAP_NONE

Using BTM_IO_CAP_NONE currently causes compilation to fail since
bta_dm_sp_cback ends up unused out a previous #ifdef that only kicks
in if BTM_IO_CAP_NONE is not set. Plugging the entire function into
a #ifdef so consistency is maintained and the framework can compile.

Bug: 35257446
Test: Built locally and run on device. Pairing without display using
JustWorks works.

Change-Id: Ibd7af6454253ccd731ff79602f327a52b8fe585b

7 years agoMerge "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)" am...
Pavlin Radoslavov [Wed, 1 Mar 2017 03:29:34 +0000 (03:29 +0000)]
Merge "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)" am: 435dbce2fe
am: 6c395f881b

Change-Id: Id4a647fc7fc586b6812182ac9ad292ccc6b5113c

7 years agoMerge "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)"
Pavlin Radoslavov [Wed, 1 Mar 2017 03:27:34 +0000 (03:27 +0000)]
Merge "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)"
am: 435dbce2fe

Change-Id: I9ea3ba4bfb72754e431e56b6ae38e370b9704970

7 years agoMerge "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)"
Treehugger Robot [Wed, 1 Mar 2017 03:25:04 +0000 (03:25 +0000)]
Merge "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)"

7 years agoMerge "Ignore AAC bitrate from the A2DP Sink device if below a threshold" am: fc33655f8a
Pavlin Radoslavov [Wed, 1 Mar 2017 02:00:03 +0000 (02:00 +0000)]
Merge "Ignore AAC bitrate from the A2DP Sink device if below a threshold" am: fc33655f8a
am: 1a3a51a93e

Change-Id: Ic436c8d895cdfec2e54f4a048efd71dda3b6f99c

7 years agoMerge "Ignore AAC bitrate from the A2DP Sink device if below a threshold"
Pavlin Radoslavov [Wed, 1 Mar 2017 01:55:16 +0000 (01:55 +0000)]
Merge "Ignore AAC bitrate from the A2DP Sink device if below a threshold"
am: fc33655f8a

Change-Id: I00628b1c1ef6bbafa85ca9f3be79707c80c84e16

7 years agoMerge "Ignore AAC bitrate from the A2DP Sink device if below a threshold"
Treehugger Robot [Wed, 1 Mar 2017 01:46:28 +0000 (01:46 +0000)]
Merge "Ignore AAC bitrate from the A2DP Sink device if below a threshold"

7 years agoMerge "btif_sock_thread: Set thread_id = -1 after join" am: 89aea85c7e
Myles Watson [Wed, 1 Mar 2017 00:37:04 +0000 (00:37 +0000)]
Merge "btif_sock_thread: Set thread_id = -1 after join" am: 89aea85c7e
am: 183f4b79a8

Change-Id: I18e233bfc2ca15381419aa3d33b02a3f8de80eed

7 years agoMerge "btif_sock_thread: Set thread_id = -1 after join"
Myles Watson [Wed, 1 Mar 2017 00:35:03 +0000 (00:35 +0000)]
Merge "btif_sock_thread: Set thread_id = -1 after join"
am: 89aea85c7e

Change-Id: I508ffc333a84a53f8aa9e224eff98de68aaec2c1

7 years agoMerge "btif_sock_thread: Set thread_id = -1 after join"
Treehugger Robot [Wed, 1 Mar 2017 00:28:52 +0000 (00:28 +0000)]
Merge "btif_sock_thread: Set thread_id = -1 after join"

7 years agoAlways restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)
Pavlin Radoslavov [Tue, 28 Feb 2017 23:30:21 +0000 (15:30 -0800)]
Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)

Some devices claim they can handle large MTU and large SBC bitpool.
However, they are struggling and eventually over time they
start delaying the "Rcvd Number of Completed Packets" reports.
Now we always limit the payload MTU to MAX_2MBPS_AVDTP_MTU(663) -
with the overhead of (4 bytes L2CAP Header + 12 bytes AVDTP Header)
such packet can fit within 2-DH5 payload size of 679 bytes.

Bug: 34127145
Test: A2DP SBC streaming to headsets and carkit
Change-Id: I2f32becba703d77d36be46158f68b8a9ef3f299a

7 years agoIgnore AAC bitrate from the A2DP Sink device if below a threshold
Pavlin Radoslavov [Fri, 17 Feb 2017 17:53:52 +0000 (09:53 -0800)]
Ignore AAC bitrate from the A2DP Sink device if below a threshold

Some Sink devices might advertise AAC zero bitrate or a very small
value (e.g., 24576). Ignore values that are below a threshold
(currently set to 64000), because those seem invalid.
For such devices, the actual streaming bitrate will be computed
based on the MTU.

Test: Code compilation
Change-Id: Ibe3de6e53681a618f388b41a01f366ad462b7a1d

7 years agoMerge "osi: Use atomic_exchange to protect is_joined" am: 8099365eba
Myles Watson [Tue, 28 Feb 2017 23:14:37 +0000 (23:14 +0000)]
Merge "osi: Use atomic_exchange to protect is_joined" am: 8099365eba
am: edb93b27fb

Change-Id: Id7c553ee372754a6cb11640226c8ff4ff027b9f7

7 years agoMerge "osi: Use atomic_exchange to protect is_joined"
Myles Watson [Tue, 28 Feb 2017 23:12:06 +0000 (23:12 +0000)]
Merge "osi: Use atomic_exchange to protect is_joined"
am: 8099365eba

Change-Id: I62da0426474815a68f7b608953d51714b393af4d

7 years agobtif: Remove redundant thread_{stop|join} am: de1695b6f0
Myles Watson [Tue, 28 Feb 2017 23:10:06 +0000 (23:10 +0000)]
btif: Remove redundant thread_{stop|join} am: de1695b6f0
am: f5bd084ff1

Change-Id: Ibe84a32dd4fdc657a761c72651d52cfc4909e073

7 years agoMerge "osi: Use atomic_exchange to protect is_joined"
Treehugger Robot [Tue, 28 Feb 2017 23:07:36 +0000 (23:07 +0000)]
Merge "osi: Use atomic_exchange to protect is_joined"

7 years agobtif: Remove redundant thread_{stop|join}
Myles Watson [Tue, 28 Feb 2017 23:07:36 +0000 (23:07 +0000)]
btif: Remove redundant thread_{stop|join}
am: de1695b6f0

Change-Id: I1f910f200c2942a1bbfbdd6d37b3dc6b0e7fed64

7 years agobtif_sock: Use atomic operations for thread_handle am: b793f4f77e
Myles Watson [Tue, 28 Feb 2017 23:01:45 +0000 (23:01 +0000)]
btif_sock: Use atomic operations for thread_handle am: b793f4f77e
am: 0fece20f14

Change-Id: Ifdd14845e73bc8fe6f362630a0fc317592409ee4

7 years agobtif_sock: Use atomic operations for thread_handle
Myles Watson [Tue, 28 Feb 2017 22:59:46 +0000 (22:59 +0000)]
btif_sock: Use atomic operations for thread_handle
am: b793f4f77e

Change-Id: Iba8b63a98db212b53ea931577b77a4b731ba2906

7 years agobtif_sock_thread: Set thread_id = -1 after join
Myles Watson [Tue, 28 Feb 2017 19:14:26 +0000 (11:14 -0800)]
btif_sock_thread: Set thread_id = -1 after join

Bug: 35690239
Test: Switch users with Bluetooth enabled
     (Disables/Enables Bluetooth under high load)
Change-Id: I6e09547cc8ffa3f01bc523ce4c18fdabfe08df99

7 years agocleanup: no assigns in conditionals
Marie Janssen [Wed, 22 Feb 2017 16:35:29 +0000 (08:35 -0800)]
cleanup: no assigns in conditionals

Some assigns snuck into our conditionals, making the code harder to
read / follow.

Also remove some unnecessary null checks after osi_malloc that are
nearby.

Test: compiles, sanity check with device
Change-Id: Ia544da44060d9fc4363af9fbcb4112f3190f75ab

7 years agobtif: Remove redundant thread_{stop|join}
Myles Watson [Tue, 28 Feb 2017 19:16:03 +0000 (11:16 -0800)]
btif: Remove redundant thread_{stop|join}

Test: Switch users with Bluetooth enabled
     (Disables/Enables Bluetooth under high load)
Change-Id: I2414fd26a0380644700d66a8fdec1fc54a1cd2f6

7 years agobtif_sock: Use atomic operations for thread_handle
Myles Watson [Tue, 28 Feb 2017 19:05:52 +0000 (11:05 -0800)]
btif_sock: Use atomic operations for thread_handle

Test: Switch users with Bluetooth enabled
     (Disables/Enables Bluetooth under high load)
Change-Id: I9039f97c090f693e798b8082fbb027e2028c8b40

7 years agoosi: Use atomic_exchange to protect is_joined
Myles Watson [Tue, 28 Feb 2017 19:01:03 +0000 (11:01 -0800)]
osi: Use atomic_exchange to protect is_joined

Test: Switch users with Bluetooth enabled
     (Disables/Enables Bluetooth under high load)
Change-Id: I34c5579b75620970f756fff28ccc07cf76599a94

7 years agoIncrease max remote ext feature pages to 3 am: f6ac424a81
Venkata Jagadeesh Garaga [Tue, 28 Feb 2017 19:08:50 +0000 (19:08 +0000)]
Increase max remote ext feature pages to 3 am: f6ac424a81
am: fe533d79b7

Change-Id: I8ede03bebbdd68cd498b07369c850c3445e4af5c

7 years agoIncrease max remote ext feature pages to 3
Venkata Jagadeesh Garaga [Tue, 28 Feb 2017 19:06:50 +0000 (19:06 +0000)]
Increase max remote ext feature pages to 3
am: f6ac424a81

Change-Id: I32f2c8bea74985235201d755c54dbc317f3e4578

7 years agoIncrease max remote ext feature pages to 3
Venkata Jagadeesh Garaga [Wed, 9 Nov 2016 05:10:20 +0000 (10:40 +0530)]
Increase max remote ext feature pages to 3

Use Case: DUT unable to pair with Xbox HID device

Steps:
1. Turn on BT
2. Start Inquiry
3. Pair with device with three extended feature pages

Failure: Unable to pair with HID device

Root Cause: DUT not responding for btm_read_remote_ext_features_complete
as we are not supporting three extended pages. So Security procedure also
not getting started.

Fix: Increase max remote ext feature pages to three from
2 as some latest remotes supporting three extended pages.
As per spec we can support 255 extended pages.

Test: Pair with device with three extended feature pages

Bug: 32999575

Change-Id: I061c78a7aaa1ab58a2fc554d026305a0124eee77

7 years agoFix libldac build on Linux am: 03aae0f5fb
Jakub Pawlowski [Tue, 28 Feb 2017 17:56:28 +0000 (17:56 +0000)]
Fix libldac build on Linux am: 03aae0f5fb
am: cfeca3821f

Change-Id: Ia35b68a39efba16a7fbf0f479d6a1a59e8b97a63

7 years agoFix libldac build on Linux
Jakub Pawlowski [Tue, 28 Feb 2017 17:54:29 +0000 (17:54 +0000)]
Fix libldac build on Linux
am: 03aae0f5fb

Change-Id: Ic3b212e6fc583b3a99087d1fb1e5206b80096377

7 years agoFix initial advertising command order am: cd0d18937e
Jakub Pawlowski [Tue, 28 Feb 2017 02:02:31 +0000 (02:02 +0000)]
Fix initial advertising command order am: cd0d18937e
am: 6bd5992870

Change-Id: I6087f2c43dd33481e27085a2fde2c7e6d5e8e098

7 years agobtsnd_hcic_ble_rand refactor am: 0c683232e2
Jakub Pawlowski [Tue, 28 Feb 2017 02:02:23 +0000 (02:02 +0000)]
btsnd_hcic_ble_rand refactor am: 0c683232e2
am: 2855c1008f

Change-Id: Ifb1ef1b34ac2ed122cd6ab576e0c48f7e4e9ee7b

7 years agoFix initial advertising command order
Jakub Pawlowski [Tue, 28 Feb 2017 02:01:02 +0000 (02:01 +0000)]
Fix initial advertising command order
am: cd0d18937e

Change-Id: I2a1d0e553a7d5d0c82ddc8cbfe1eba9160584334

7 years agobtsnd_hcic_ble_rand refactor
Jakub Pawlowski [Tue, 28 Feb 2017 02:00:53 +0000 (02:00 +0000)]
btsnd_hcic_ble_rand refactor
am: 0c683232e2

Change-Id: I0a36f6335b98128b53fe3f9a2c89e7b442a8954f

7 years agoFix libldac build on Linux
Jakub Pawlowski [Tue, 28 Feb 2017 01:51:44 +0000 (17:51 -0800)]
Fix libldac build on Linux

In build/BUILD.gn we set EXPORT_SYMBOL value, and it's used across the
whole stack. However, third party libraries require this value to be
cleared - otherwise the symbols are not exported properly.

Test: manual

7 years agoFix initial advertising command order
Jakub Pawlowski [Fri, 24 Feb 2017 19:35:07 +0000 (11:35 -0800)]
Fix initial advertising command order

Set the address during SetParameters, for VSC implementation, and right
after setting parameters for BT5 implementation.

Test: sl4a ConcurrentBleAdvertisingTest
Bug: 33922058
Bug: 34962013
Change-Id: Idcc60a36884607de191066d8be1ee3bc459e86fc

7 years agobtsnd_hcic_ble_rand refactor
Jakub Pawlowski [Fri, 24 Feb 2017 17:49:59 +0000 (09:49 -0800)]
btsnd_hcic_ble_rand refactor

Make btsnd_hcic_ble_rand accept base::Callback instead of function
pointer. This will result in great code simplifications in further
patches.

Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I9933caa78b20d0011ce3e17fd72d5740bcc4ae6d

7 years agotest_vendor: Replace __FUNCTION__ with __func__ am: 8cd930cc9d
Myles Watson [Sat, 25 Feb 2017 02:31:14 +0000 (02:31 +0000)]
test_vendor: Replace __FUNCTION__ with __func__ am: 8cd930cc9d
am: a4e4392471

Change-Id: I548d1d9a0c2055be1348e9d30ef1919c6ff4b698

7 years agotest_vendor: Replace __FUNCTION__ with __func__
Myles Watson [Sat, 25 Feb 2017 02:28:16 +0000 (02:28 +0000)]
test_vendor: Replace __FUNCTION__ with __func__
am: 8cd930cc9d

Change-Id: I5608b7565b3ddb0679f5865016daa876855e63a7

7 years agotest_vendor: Replace __FUNCTION__ with __func__
Myles Watson [Tue, 13 Dec 2016 17:47:55 +0000 (09:47 -0800)]
test_vendor: Replace __FUNCTION__ with __func__

Test: Bluetooth settings still works
Change-Id: I4de24cceb9beb262ce7f96e7291288b70618f694

7 years agoRevert "HID: Fix scroll issue with Apple Magic Mouse" am: f11e42b1c2
Ajay Panicker [Fri, 24 Feb 2017 19:26:42 +0000 (19:26 +0000)]
Revert "HID: Fix scroll issue with Apple Magic Mouse" am: f11e42b1c2
am: ef00170ba7

Change-Id: I3f197b8933772d22937e32baba6fa58ebcf488d5

7 years agoRevert "HID: Fix scroll issue with Apple Magic Mouse"
Ajay Panicker [Fri, 24 Feb 2017 19:24:43 +0000 (19:24 +0000)]
Revert "HID: Fix scroll issue with Apple Magic Mouse"
am: f11e42b1c2

Change-Id: I1697dbe5da844376f11ec4003f84e9fb50d67cb4

7 years agoRevert "HID: Fix scroll issue with Apple Magic Mouse"
Ajay Panicker [Fri, 24 Feb 2017 17:37:30 +0000 (17:37 +0000)]
Revert "HID: Fix scroll issue with Apple Magic Mouse"

Reverting due to the fact that this causes many HID issues with fugu.
The general problem seems to be that this patch requires kernel 3.18
while fugu is currently on 3.10. Will investigate further later but
reverting for now to fix fugu.

This reverts commit 3e2201163b609aab6dcc0778158e790c3201353b.
Fixes: 35667962
Fixes: 35712367
Change-Id: I536da368fc9796b26dc52892eda6501772683330

7 years agoMerge "Set the AAC audioMuxVersion to "2"" am: ee975e8740
Pavlin Radoslavov [Fri, 24 Feb 2017 02:52:13 +0000 (02:52 +0000)]
Merge "Set the AAC audioMuxVersion to "2"" am: ee975e8740
am: 4ef69ae24c

Change-Id: I1bb9bbe9d83458c8d080d3bf6da54b22e488440f