OSDN Git Service
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
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
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
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
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
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
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
Marie Janssen [Thu, 2 Mar 2017 17:08:53 +0000 (17:08 +0000)]
Merge "cleanup: no assigns in conditionals"
am:
20d25f4a11
Change-Id: Id6c9397753e2c971b21c5a08562d8228d6edeb9e
Treehugger Robot [Thu, 2 Mar 2017 17:05:10 +0000 (17:05 +0000)]
Merge "cleanup: no assigns in conditionals"
Bailey Forrest [Wed, 1 Mar 2017 23:00:34 +0000 (23:00 +0000)]
Disable broken unittest am:
042ac33ca2
am:
a334dd605e
Change-Id: Ibf6369cb548e06ed77e7ad98d4c2b2901f19444a
Bailey Forrest [Wed, 1 Mar 2017 22:55:36 +0000 (22:55 +0000)]
Disable broken unittest
am:
042ac33ca2
Change-Id: I133b3c9b8a2df18b1497c0a561bcfdbc7ea4cee6
Bailey Forrest [Wed, 1 Mar 2017 19:49:14 +0000 (11:49 -0800)]
Disable broken unittest
Change-Id: I9c7dbd8dfdb440a31e4c98e93ee533fe96ee7b0e
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
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
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
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
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
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)"
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
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
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"
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
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
Treehugger Robot [Wed, 1 Mar 2017 00:28:52 +0000 (00:28 +0000)]
Merge "btif_sock_thread: Set thread_id = -1 after join"
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
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
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
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
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
Treehugger Robot [Tue, 28 Feb 2017 23:07:36 +0000 (23:07 +0000)]
Merge "osi: Use atomic_exchange to protect is_joined"
Myles Watson [Tue, 28 Feb 2017 23:07:36 +0000 (23:07 +0000)]
btif: Remove redundant thread_{stop|join}
am:
de1695b6f0
Change-Id: I1f910f200c2942a1bbfbdd6d37b3dc6b0e7fed64
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
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
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
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
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
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
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
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
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
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
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
Jakub Pawlowski [Tue, 28 Feb 2017 17:54:29 +0000 (17:54 +0000)]
Fix libldac build on Linux
am:
03aae0f5fb
Change-Id: Ic3b212e6fc583b3a99087d1fb1e5206b80096377
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
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
Jakub Pawlowski [Tue, 28 Feb 2017 02:01:02 +0000 (02:01 +0000)]
Fix initial advertising command order
am:
cd0d18937e
Change-Id: I2a1d0e553a7d5d0c82ddc8cbfe1eba9160584334
Jakub Pawlowski [Tue, 28 Feb 2017 02:00:53 +0000 (02:00 +0000)]
btsnd_hcic_ble_rand refactor
am:
0c683232e2
Change-Id: I0a36f6335b98128b53fe3f9a2c89e7b442a8954f
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
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
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
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
Myles Watson [Sat, 25 Feb 2017 02:28:16 +0000 (02:28 +0000)]
test_vendor: Replace __FUNCTION__ with __func__
am:
8cd930cc9d
Change-Id: I5608b7565b3ddb0679f5865016daa876855e63a7
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
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
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
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
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
Pavlin Radoslavov [Fri, 24 Feb 2017 02:50:42 +0000 (02:50 +0000)]
Merge "Set the AAC audioMuxVersion to "2""
am:
ee975e8740
Change-Id: I96db4dee5da91a602e00d362530865239c2bc909
Treehugger Robot [Fri, 24 Feb 2017 02:48:23 +0000 (02:48 +0000)]
Merge "Set the AAC audioMuxVersion to "2""
Pavlin Radoslavov [Fri, 24 Feb 2017 01:07:05 +0000 (01:07 +0000)]
Merge "Update the AAC bitrate settings" am:
13f4c4d474
am:
286a60387d
Change-Id: I9c1493a570507a4a33b59810e41925e86219dbaa
Pavlin Radoslavov [Fri, 24 Feb 2017 01:04:40 +0000 (01:04 +0000)]
Merge "Update the AAC bitrate settings"
am:
13f4c4d474
Change-Id: I2bea4a4bb701f2e6cbc4791446d78801482b442f
Treehugger Robot [Fri, 24 Feb 2017 01:01:15 +0000 (01:01 +0000)]
Merge "Update the AAC bitrate settings"
Jakub Pawlowski [Fri, 24 Feb 2017 00:57:35 +0000 (00:57 +0000)]
Display passkey when bonding am:
197a1b99e5
am:
183c0440c8
Change-Id: Ic8a626c68032842b71b132f05a613ba9c9134749
Jakub Pawlowski [Fri, 24 Feb 2017 00:55:08 +0000 (00:55 +0000)]
Display passkey when bonding
am:
197a1b99e5
Change-Id: If3756ba5ac9bee99116e8845806826aaa3e80076
Jakub Pawlowski [Thu, 23 Feb 2017 22:43:08 +0000 (14:43 -0800)]
Display passkey when bonding
Test: manual
Change-Id: I238dfadf401b90d52caa4c381ea068b48091c092
Jakub Pawlowski [Fri, 24 Feb 2017 00:20:01 +0000 (00:20 +0000)]
Merge "Clear state mask when scan stopped" am:
6f77461775
am:
a59ec30437
Change-Id: Ieaf3c1a880572052eaff15d5aa03315cbc19cef8
Jakub Pawlowski [Fri, 24 Feb 2017 00:17:33 +0000 (00:17 +0000)]
Merge "Clear state mask when scan stopped"
am:
6f77461775
Change-Id: I628ce848b48928f2da2b04befbaaf7d8b021d35b
Treehugger Robot [Fri, 24 Feb 2017 00:14:26 +0000 (00:14 +0000)]
Merge "Clear state mask when scan stopped"
Pavlin Radoslavov [Thu, 23 Feb 2017 21:57:15 +0000 (13:57 -0800)]
Set the AAC audioMuxVersion to "2"
This change is needed, because there are Sink devices that
expect a fixed latmBufferFullness value.
Bug:
35715579
Test: A2DP streaming to various devices
Change-Id: Ia27490920cda273cee15bfd7e643b85a5c5e428d
Pavlin Radoslavov [Thu, 23 Feb 2017 21:49:54 +0000 (13:49 -0800)]
Update the AAC bitrate settings
Use AACENC_PEAK_BITRATE to limit the maximum bitrate as limited by
the MTU, and use AACENC_BITRATE to set the encoder bitrate.
Previously, both were set to the same value. That was disabling
the AAC bitreservoir, and eventually affecting the audio quality.
Bug:
35715570
Test: A2DP streaming to various devices
Change-Id: I6adac4889f9b2d7509182df8961ddfada02ee8ac
Bluetooth Build Test [Thu, 23 Feb 2017 22:55:55 +0000 (22:55 +0000)]
Don't build vendor lib on Linux am:
3eadf272be
am:
4095ae7196
Change-Id: Id3ca53009349320c7316fdfa8cf89cb4374ea465
Bluetooth Build Test [Thu, 23 Feb 2017 22:53:56 +0000 (22:53 +0000)]
Don't build vendor lib on Linux
am:
3eadf272be
Change-Id: I1eb9b9e320de0f624a585fc7668969cc8a56ffd8
Bluetooth Build Test [Wed, 22 Feb 2017 19:52:30 +0000 (11:52 -0800)]
Don't build vendor lib on Linux
The stack does no longer use vendor libs. We use hci_layer_linux.cc now.
Test: manual
Change-Id: I6c64337280c073647faf0bd775d75c5d700e7911
Jakub Pawlowski [Thu, 23 Feb 2017 21:55:02 +0000 (13:55 -0800)]
Clear state mask when scan stopped
Test: manual test
Change-Id: Icc47679aaba92afd7f3eab48416065d3a741a745
Jakub Pawlowski [Thu, 23 Feb 2017 19:41:41 +0000 (19:41 +0000)]
Log which advertising HCI interface is used am:
9bb5a64390
am:
c69f0c926d
Change-Id: I6ad4d5aab0a0d5b91ce1d24c2a4c39152769a482
Jakub Pawlowski [Thu, 23 Feb 2017 19:39:14 +0000 (19:39 +0000)]
Log which advertising HCI interface is used
am:
9bb5a64390
Change-Id: I25376b92d1d4b51c5c99823a62660b181a34d2a1
Jakub Pawlowski [Thu, 23 Feb 2017 17:50:31 +0000 (09:50 -0800)]
Log which advertising HCI interface is used
This is useful for debugging advertising issues.
Test: manual
Change-Id: Ia51eccb1ff7922a5864572a89e77404299965862
Pavlin Radoslavov [Thu, 23 Feb 2017 18:32:38 +0000 (18:32 +0000)]
Merge "Close leftover Audio-to-Bluetooth HAL connections before reopening" am:
06a384fde6
am:
220ad33802
Change-Id: I24a89516528b5d9e4dd0cab2611f3750c097cf23
Pavlin Radoslavov [Thu, 23 Feb 2017 18:30:38 +0000 (18:30 +0000)]
Merge "Close leftover Audio-to-Bluetooth HAL connections before reopening"
am:
06a384fde6
Change-Id: I6924175127d046ffd77d3215c32089ea69df158f
Treehugger Robot [Thu, 23 Feb 2017 18:26:03 +0000 (18:26 +0000)]
Merge "Close leftover Audio-to-Bluetooth HAL connections before reopening"
Jakub Pawlowski [Thu, 23 Feb 2017 17:33:04 +0000 (17:33 +0000)]
Fix stack shutdown on Linux am:
8342d95fa5
am:
5730be777f
Change-Id: I507c7793ee0b1d42095860d2fe2ed16cae4a05fd
Jakub Pawlowski [Thu, 23 Feb 2017 17:31:05 +0000 (17:31 +0000)]
Fix stack shutdown on Linux
am:
8342d95fa5
Change-Id: I11181cab2c052a9a011348ca2820b8e88de484a6
Jakub Pawlowski [Thu, 23 Feb 2017 01:14:29 +0000 (17:14 -0800)]
Fix stack shutdown on Linux
Right now, hci_close() is getting stuck on stopping the reader thread.
In order to fix that, we must have a way to exit the blocking read when
shutting down the stack.
Test: manual
Change-Id: I3a7eeef6d8ed223fc96ba9eeacca37006a5c9739
Pavlin Radoslavov [Thu, 23 Feb 2017 06:07:17 +0000 (22:07 -0800)]
Close leftover Audio-to-Bluetooth HAL connections before reopening
If the Audio-to-Bluetooth HAL reopens a connection on the Data or
Control channel without closing first the old one, the UIPC select(2)
loop gets confused and could spin with 100% CPU usage.
Now we check for channels that are reopened, and explicitly close
them before reopening.
Also, fix a check whether a file descriptor is valid: 0 is a valid
file descriptor.
Test: A2DP testing with a headset: connect/play/stop
Bug:
35394629
Change-Id: I7ae988ac77f25da56e59e347363e7c473e7f69a9
Myles Watson [Thu, 23 Feb 2017 12:06:48 +0000 (12:06 +0000)]
Merge "test_vendor: Return success for no-ops" am:
e770da5966
am:
1352a15d95
Change-Id: Idde19d2448939bb9da9432f361478b7ddcc3cda7
Myles Watson [Thu, 23 Feb 2017 12:04:48 +0000 (12:04 +0000)]
Merge "test_vendor: Return success for no-ops"
am:
e770da5966
Change-Id: Idab0d0c1f0eb716eb954ecc02f0a100c24c28048
Treehugger Robot [Thu, 23 Feb 2017 12:01:32 +0000 (12:01 +0000)]
Merge "test_vendor: Return success for no-ops"
Jakub Pawlowski [Wed, 22 Feb 2017 23:33:11 +0000 (23:33 +0000)]
HCI for Linux am:
9329b8effa
am:
973587167b
Change-Id: I44b577fa4733f30e0262a9aacae58c0b9ccb6ecc
Jakub Pawlowski [Wed, 22 Feb 2017 23:33:02 +0000 (23:33 +0000)]
Move Android specific HCI code into separate file am:
32fbec6a86
am:
c87cb4c098
Change-Id: Ie983b0868454c3addbb496a11f7458f84dd8be7d
Jakub Pawlowski [Wed, 22 Feb 2017 23:30:04 +0000 (23:30 +0000)]
HCI for Linux
am:
9329b8effa
Change-Id: Ifd7919db1c605a5fe2ba9603b8ca5536b67a1474
Jakub Pawlowski [Wed, 22 Feb 2017 23:29:54 +0000 (23:29 +0000)]
Move Android specific HCI code into separate file
am:
32fbec6a86
Change-Id: I2483d6849534efd3c752a360c9939ecad8b7fb59
Jakub Pawlowski [Tue, 21 Feb 2017 22:55:21 +0000 (14:55 -0800)]
HCI for Linux
Test: manual
Change-Id: I7183c4773ae409f63296bd3c53a02ec2a460f021
Jakub Pawlowski [Tue, 21 Feb 2017 21:28:10 +0000 (13:28 -0800)]
Move Android specific HCI code into separate file
Test: manual
Change-Id: I0a99e528acaa1adec39425b7bf6f8d8b5c024632
Jakub Pawlowski [Wed, 22 Feb 2017 21:02:57 +0000 (21:02 +0000)]
Fix stack crash after bonding am:
71a58bdcf0
am:
18843a9aac
Change-Id: I549651268e6ce1538571f6153b45adfb48cde4da
Jakub Pawlowski [Wed, 22 Feb 2017 21:00:48 +0000 (21:00 +0000)]
Fix stack crash after bonding
am:
71a58bdcf0
Change-Id: Ic4cb6957bc082185e8d340e65b2519b9a670edcf
Jakub Pawlowski [Wed, 22 Feb 2017 18:34:45 +0000 (10:34 -0800)]
Fix stack crash after bonding
delayed_auth_timer_ent was freed and re-created during it's execution.
Instead of re-creating, just cancel the timers in smp_cb_cleanup.
Test: manual, bond with HID device on linux
Bug:
34083285
Change-Id: Ie569666846db5dcb2466cff00665b2c1490d7d10
Chih-Hung Hsieh [Tue, 21 Feb 2017 23:49:05 +0000 (23:49 +0000)]
Use email address in OWNERS files. am:
bd93e0a919
am:
6a22310128
Change-Id: I180dd563b402f8273992dab719eec42617d01253
Chih-Hung Hsieh [Tue, 21 Feb 2017 23:47:04 +0000 (23:47 +0000)]
Use email address in OWNERS files.
am:
bd93e0a919
Change-Id: Ib1c255b055be24761537b5d64a373bd71027b53a
Chih-Hung Hsieh [Tue, 21 Feb 2017 21:48:52 +0000 (13:48 -0800)]
Use email address in OWNERS files.
Bug:
33166666
Test: default build targets
Change-Id: Id2b579215291cb1f6ae03ebc167f07bd59713dc4
Jakub Pawlowski [Tue, 21 Feb 2017 19:56:55 +0000 (19:56 +0000)]
Linux build fix am:
a386df9ac1
am:
554e32705f
Change-Id: I9200f6dbb6ef6b507296a54218cec8cc6134a141
OSDN Git Service
