OSDN Git Service
Jakub Pawlowski [Thu, 25 May 2017 21:27:39 +0000 (21:27 +0000)]
Fix crashes when GAP operation is interrupted by disconnection am:
feec106412 am:
99664212c1
am:
83466c0e38
Change-Id: I8e809b78a471b2ec98f08a8d3e8cf457f83d5fb2
Jakub Pawlowski [Thu, 25 May 2017 21:22:39 +0000 (21:22 +0000)]
Fix crashes when GAP operation is interrupted by disconnection am:
feec106412
am:
99664212c1
Change-Id: Iede38cf945d63498158f7967eac3c20b8b4e331b
Jakub Pawlowski [Thu, 25 May 2017 21:18:09 +0000 (21:18 +0000)]
Fix crashes when GAP operation is interrupted by disconnection
am:
feec106412
Change-Id: I3e714e751e0110cbff1ad6459e5e51b1cd324e56
Jakub Pawlowski [Thu, 25 May 2017 15:21:53 +0000 (08:21 -0700)]
Fix crashes when GAP operation is interrupted by disconnection
Also fixes potential issue while allocating control blocks.
Test: none
Bug:
38499153
Change-Id: I5101ac97476953cdfece45c3fa9b909e38b9d2dd
Jakub Pawlowski [Thu, 25 May 2017 14:29:24 +0000 (14:29 +0000)]
Fix GATT Server disconnecting for no reason am:
b69edd55ff am:
96c6be22d9
am:
13b562a161
Change-Id: I60718b6a9fe94bf954623e53fc44cbd596d9771e
Jakub Pawlowski [Thu, 25 May 2017 14:25:23 +0000 (14:25 +0000)]
Fix GATT Server disconnecting for no reason am:
b69edd55ff
am:
96c6be22d9
Change-Id: I21a5025712598779f7d0501031aa7bf4690fd853
Jakub Pawlowski [Thu, 25 May 2017 14:21:53 +0000 (14:21 +0000)]
Fix GATT Server disconnecting for no reason
am:
b69edd55ff
Change-Id: I02d9ded4520eabb317b85a5a10888e9432c991cf
Jakub Pawlowski [Wed, 24 May 2017 23:15:21 +0000 (16:15 -0700)]
Fix GATT Server disconnecting for no reason
When two devices are bonded, even if the device is supposed to act just
as a GATT Server, service discovery is performed. Doing "read by type"
should not trigger connection timeout, or disconnection, as the server
should wait for the client to finish connection.
Please note that it does not GATT Client behaviour, as they manage the
connection timeout through L2CA_SendFixedChnlData called on each data
packet.
Bug:
34951749
Test: manual
Change-Id: If53cf63dc204238a60839497992c870b1b39aa60
Jack He [Wed, 24 May 2017 20:48:22 +0000 (20:48 +0000)]
MCAP: Add test interface for PTS test (2/2) am:
722ce12bab am:
445f930bc8
am:
3ca7ae5d93
Change-Id: I1b1d1a9824a0bf6bf4ed8ac373f21bbe73a8f44e
Jack He [Wed, 24 May 2017 20:45:47 +0000 (20:45 +0000)]
MCAP: Add test interface for PTS test (2/2) am:
722ce12bab
am:
445f930bc8
Change-Id: If205315f7e2dde0fd2bd99fb03793d5159399a1f
Jack He [Wed, 24 May 2017 20:42:46 +0000 (20:42 +0000)]
MCAP: Add test interface for PTS test (2/2)
am:
722ce12bab
Change-Id: Idf202cccd67609408beb0f7ca7b98b75b914abf8
Jack He [Wed, 24 May 2017 17:50:16 +0000 (17:50 +0000)]
MCAP: Fix bugs in MCAP stack
am:
0f54d697b7
Change-Id: Ib8192ca8dee9e00f2190c1f3eda1ca7c76bfd055
Jack He [Thu, 18 May 2017 05:22:18 +0000 (22:22 -0700)]
MCAP: Fix bugs in MCAP stack
* Fix error response message for clock sync opcodes
* Fix error response message for CREATE_MDL opcode
* Fix logging in the MCAP stack
Bug:
37867299
Test: make, PTS MCAP test
Change-Id: I7a37ac04806bca20d732357f00b4761577b4be19
(cherry picked from commit
b3a8dc2ece90770b41f4bc0555fabb2742093176)
Jack He [Wed, 24 May 2017 00:52:30 +0000 (00:52 +0000)]
eSCO: Format changes to original vendor patch (4/5)
am:
a43e1304c2
Change-Id: Idba6f8de605855aa29029ba0d110c43e47cf192a
Jack He [Wed, 24 May 2017 00:52:27 +0000 (00:52 +0000)]
eSCO: Additional fix to get eSCO working for HFP and HSP (3/5)
am:
a9152a2892
Change-Id: Ib55cde122d419a0e6c295d86bf44aa9a37fc41d3
Myles Watson [Wed, 24 May 2017 00:52:24 +0000 (00:52 +0000)]
eSCO: Remove BTM_WBS_INCLUDED from the stack (2/5)
am:
5b9aaac278 -s ours
Change-Id: Ic6b01448a10d59905aefb696123e3c30c98b99df
Mudumba Ananth [Wed, 24 May 2017 00:52:21 +0000 (00:52 +0000)]
eSCO: BT 4.1 Enhanced SCO command (1/5)
am:
181863e6c2 -s ours
Change-Id: Ifc5c70990697fdcedc2ff070f7e7d35e939512f0
Jack He [Sat, 13 May 2017 20:52:12 +0000 (13:52 -0700)]
MCAP: Add test interface for PTS test (2/2)
* PTS tests requires MCAP APIs to be called at protocol level
* This CL creates a test interface to enable the above functionality
Bug:
37867299
Test: make, no user visible effect
Change-Id: I15cc6cc613ce8f7c57564296e45077ab877c269b
Jack He [Tue, 23 May 2017 22:55:59 +0000 (22:55 +0000)]
MCAP: Fix bugs in MCAP stack am:
b3a8dc2ece am:
76c828952b
am:
072b2734e4
Change-Id: Ic269878b285252c81cf0fb4d572497378805bc38
Jack He [Tue, 23 May 2017 22:53:34 +0000 (22:53 +0000)]
MCAP: Fix bugs in MCAP stack am:
b3a8dc2ece
am:
76c828952b
Change-Id: I82124c3cba4009b4f33d2188afd31e67cd6b98d8
Jack He [Tue, 23 May 2017 22:50:39 +0000 (22:50 +0000)]
MCAP: Fix bugs in MCAP stack
am:
b3a8dc2ece
Change-Id: I325234385a1b27cfdef45a785b09880b56570f93
Jack He [Thu, 18 May 2017 05:22:18 +0000 (22:22 -0700)]
MCAP: Fix bugs in MCAP stack
* Fix error response message for clock sync opcodes
* Fix error response message for CREATE_MDL opcode
* Fix logging in the MCAP stack
Bug:
37867299
Test: make, PTS MCAP test
Change-Id: I7a37ac04806bca20d732357f00b4761577b4be19
Jack He [Mon, 8 May 2017 00:27:47 +0000 (17:27 -0700)]
eSCO: Format changes to original vendor patch (4/5)
* Format changes to original vendor patch
* Re-order part of SCO creation code to improve readability
* Make log more concise and usefull
Bug:
19540029
Test: make, HFP PTS test, testplans/86884, testplans/87103
Change-Id: Ie0199519afb30f56568c04fef728fce44a172063
(cherry picked from commit
fe695a557a92053d4c44428ba08c0b8e945d4711)
Jack He [Mon, 8 May 2017 00:26:02 +0000 (17:26 -0700)]
eSCO: Additional fix to get eSCO working for HFP and HSP (3/5)
* Removed vendor specific call after codec negotiation and before eSCO
command is sent to Bluetooth chip
* Removed vendor specific call after a SCO connection is requested by
the peer
* Removed vendor specific save audio state methods
Bug:
19540029
Test: make, HFP PTS test, testplans/86884, testplans/87103
Change-Id: I899405a8eaa2f38ee0de04949c5288f9eefa74df
(cherry picked from commit
400ac497f45181d3c64f6a19687992de9b69b094)
Myles Watson [Fri, 10 Feb 2017 00:26:34 +0000 (16:26 -0800)]
eSCO: Remove BTM_WBS_INCLUDED from the stack (2/5)
All of our platforms support WBS.
Bug:
19540029
Test: make, HFP PTS test, testplans/86884, testplans/87103
Change-Id: I384d49f73935ebb35b17132e71c85174797c435e
(cherry picked from commit
3e634d6c1e83f053005c9abdbd89e662ad81c4d4)
Mudumba Ananth [Thu, 9 Feb 2017 17:05:48 +0000 (09:05 -0800)]
eSCO: BT 4.1 Enhanced SCO command (1/5)
Added support for BT 4.1 enhanced SCO feature on the stack.
This feature allows the stack to create a SCO connection with
remote device by using Hci_Enhanced_Setup_Synchronous_Connection
command after checking the controller (4.1) support for
enhanced SCO command.
Added the command parameters to use the command in both wide band
speech(WBS) and narrow band speech(NBS) scenarios.
Number of Broadcom vendor specific commands(VSCs)that are needed
to be sent to Broadcom controllers along with this command have
also been updated accordingly
NOTE: This change would also need a firmware patch for
the feature to work on Broadcom contollers which will
be delivered to Google in a separate change set.
Bug:
19540029
Test: make, HFP PTS test, testplans/86884, testplans/87103
Change-Id: I1014d81be5cbe91078a4484dd072ac3957bfdfe4
(cherry picked from commit
57f6508cf7b22788fa2e7a739cec241b785718fb)
Ajay Panicker [Mon, 22 May 2017 23:13:41 +0000 (23:13 +0000)]
Merge "Remove logspam when initializing logging for Bluetooth" into oc-dev
am:
844269f438
Change-Id: Ia05bfd0fa7238dbad6b1c50edc4661fed36c3bad
Ajay Panicker [Mon, 22 May 2017 23:13:28 +0000 (23:13 +0000)]
Remove logspam when adding GATT attributes
am:
c2f4110f06
Change-Id: I186f6dc27a765ddda24af6a8c2a8b2a7c1cf7db7
TreeHugger Robot [Mon, 22 May 2017 22:54:35 +0000 (22:54 +0000)]
Merge "Remove logspam when initializing logging for Bluetooth" into oc-dev
Ajay Panicker [Mon, 22 May 2017 22:19:56 +0000 (22:19 +0000)]
Merge "Remove logspam when initializing logging for Bluetooth" am:
0e3621da9f am:
040a8c6a4e
am:
1e70701ee3
Change-Id: Ibadfa81f47b132a0beabf2fc31b7b8cc4aa8a6f0
Ajay Panicker [Mon, 22 May 2017 22:11:57 +0000 (22:11 +0000)]
Remove logspam when adding GATT attributes am:
60177e01c4 am:
0c68aa7656
am:
4be48fe38a
Change-Id: If5881fae94c5bc8df2160d2cab1bd34c02773bf5
Ajay Panicker [Mon, 22 May 2017 22:11:56 +0000 (22:11 +0000)]
Merge "Remove logspam when initializing logging for Bluetooth" am:
0e3621da9f
am:
040a8c6a4e
Change-Id: I8df73a5791ad79c9111d350efd6d38b9b20b9377
Ajay Panicker [Mon, 22 May 2017 22:03:56 +0000 (22:03 +0000)]
Merge "Remove logspam when initializing logging for Bluetooth"
am:
0e3621da9f
Change-Id: I37043759504c279eb9063df8dddfa35762843462
Ajay Panicker [Mon, 22 May 2017 22:03:56 +0000 (22:03 +0000)]
Remove logspam when adding GATT attributes am:
60177e01c4
am:
0c68aa7656
Change-Id: Iec79072ff63213b76330187af93e171beca133a8
Ajay Panicker [Mon, 22 May 2017 21:57:58 +0000 (21:57 +0000)]
Remove logspam when adding GATT attributes
am:
60177e01c4
Change-Id: I1f740dbf89ae5a2888a053d31d37d292748872e7
Treehugger Robot [Mon, 22 May 2017 21:55:19 +0000 (21:55 +0000)]
Merge "Remove logspam when initializing logging for Bluetooth"
Ajay Panicker [Wed, 17 May 2017 05:43:51 +0000 (22:43 -0700)]
Remove logspam when initializing logging for Bluetooth
Bug:
37803501
Test: Code still compiles
Change-Id: I9326e58aff0d80e441cb92c41e0e4a7d70e32b1b
(cherry picked from commit
5dd1e2de4a7411870d7ca13f549690a6498a6452)
Ajay Panicker [Wed, 17 May 2017 01:46:22 +0000 (18:46 -0700)]
Remove logspam when adding GATT attributes
Bug:
37905488
Test: Code still compiles
Change-Id: I479fc82a15f977b7e3d50b07302241909efc8856
(cherry picked from commit
60177e01c4644d1194d75248e8d2a6b1b40f7670)
Ajay Panicker [Wed, 17 May 2017 01:46:22 +0000 (18:46 -0700)]
Remove logspam when adding GATT attributes
Bug:
37905488
Test: Code still compiles
Change-Id: I479fc82a15f977b7e3d50b07302241909efc8856
Ajay Panicker [Wed, 17 May 2017 05:43:51 +0000 (22:43 -0700)]
Remove logspam when initializing logging for Bluetooth
Bug:
37803501
Test: Code still compiles
Change-Id: I9326e58aff0d80e441cb92c41e0e4a7d70e32b1b
Jaganath Kanakkassery [Mon, 22 May 2017 18:25:59 +0000 (18:25 +0000)]
Merge "Reject LE COC if cid is duplicated" into oc-dev
am:
247a5c25ec
Change-Id: Ie282096381cab5daec8840538820b9d5ed97a718
TreeHugger Robot [Mon, 22 May 2017 18:17:41 +0000 (18:17 +0000)]
Merge "Reject LE COC if cid is duplicated" into oc-dev
Jakub Pawlowski [Thu, 18 May 2017 18:25:34 +0000 (18:25 +0000)]
Protect concurrent access to local state used during BLE scanning
am:
235e738f20
Change-Id: Iff976d8a0599fa35a82e659931bb9a885d9fafd0
Jakub Pawlowski [Wed, 17 May 2017 22:23:22 +0000 (15:23 -0700)]
Protect concurrent access to local state used during BLE scanning
Make sure that all access happens on jni thread
Bug:
38298938
Test: Code compilation
Change-Id: I38246626d2c6390586b314b27889dd9ba905f406
(cherry picked from commit
eb43e9cf12139aeb227e26a8201a80974129c553)
Pavlin Radoslavov [Thu, 18 May 2017 02:16:45 +0000 (02:16 +0000)]
Protect the message loop from accesses after HCI shutdown
am:
fd7e60b1fd
Change-Id: I260db9f87eb20d8eb8f248cf93b31d7906dfc3af
Pavlin Radoslavov [Thu, 18 May 2017 01:30:25 +0000 (01:30 +0000)]
Merge "Protect the message loop from accesses after HCI shutdown" am:
e5a161ef01 am:
5240933dbd
am:
d0a5c8be62
Change-Id: Ib55d27819ae161f22f7852289ac0f036fed06677
Pavlin Radoslavov [Thu, 18 May 2017 01:26:54 +0000 (01:26 +0000)]
Merge "Protect the message loop from accesses after HCI shutdown" am:
e5a161ef01
am:
5240933dbd
Change-Id: Iaf00aea595eacd9da669de3c968e2dc0ad1e2b40
Pavlin Radoslavov [Thu, 18 May 2017 01:23:24 +0000 (01:23 +0000)]
Merge "Protect the message loop from accesses after HCI shutdown"
am:
e5a161ef01
Change-Id: I00d1ae80216d84119234b79d3110bc0f9560b6bf
Treehugger Robot [Thu, 18 May 2017 01:12:49 +0000 (01:12 +0000)]
Merge "Protect the message loop from accesses after HCI shutdown"
Jakub Pawlowski [Thu, 18 May 2017 00:23:20 +0000 (00:23 +0000)]
Protect concurrent access to local state used during BLE scanning am:
eb43e9cf12 am:
e6b3b39b8a
am:
c9d72eeb83
Change-Id: I9c21c468416cf5bb68db3ba25e3ff83015507942
Jakub Pawlowski [Thu, 18 May 2017 00:19:50 +0000 (00:19 +0000)]
Protect concurrent access to local state used during BLE scanning am:
eb43e9cf12
am:
e6b3b39b8a
Change-Id: Iddd799d38d71606131424ab6514f3c7e49786c69
Jakub Pawlowski [Thu, 18 May 2017 00:16:49 +0000 (00:16 +0000)]
Protect concurrent access to local state used during BLE scanning
am:
eb43e9cf12
Change-Id: Ic5b8a1677799e18402921b874a0f58c2e0aa1541
Pavlin Radoslavov [Wed, 17 May 2017 01:50:43 +0000 (18:50 -0700)]
Protect the message loop from accesses after HCI shutdown
Bug:
38330724
Test: Manual: enable/disable Bluetooth
Change-Id: Iaece4cd608c67b28b436ded9fcc51c0bf28f4098
(cherry picked from commit
7277f39540fefe551dc2120fc4db787a9ed57646)
Pavlin Radoslavov [Wed, 17 May 2017 01:50:43 +0000 (18:50 -0700)]
Protect the message loop from accesses after HCI shutdown
Bug:
38330724
Test: Manual: enable/disable Bluetooth
Change-Id: Iaece4cd608c67b28b436ded9fcc51c0bf28f4098
Marie Janssen [Wed, 17 May 2017 23:19:34 +0000 (23:19 +0000)]
Blacklist Kinivo BTC350 for Absolute Volume
am:
84e8fa9b08
Change-Id: I1905a7dec2800f578c390d1cf61acb986262e75e
Jakub Pawlowski [Wed, 17 May 2017 22:23:22 +0000 (15:23 -0700)]
Protect concurrent access to local state used during BLE scanning
Make sure that all access happens on jni thread
Bug:
38298938
Test: Code compilation
Change-Id: I38246626d2c6390586b314b27889dd9ba905f406
Marie Janssen [Wed, 17 May 2017 21:02:03 +0000 (21:02 +0000)]
Blacklist Kinivo BTC350 for Absolute Volume am:
e1fca1bacd am:
7413f9baa6
am:
117e5763a7
Change-Id: Ia11520fa1883465a30cd9dcb5ea5dbf87884f862
Marie Janssen [Wed, 17 May 2017 20:57:35 +0000 (20:57 +0000)]
Blacklist Kinivo BTC350 for Absolute Volume am:
e1fca1bacd
am:
7413f9baa6
Change-Id: I472a6d8c938d8c511f06b9f612b8cc0b5034c624
Marie Janssen [Wed, 17 May 2017 20:54:03 +0000 (20:54 +0000)]
Blacklist Kinivo BTC350 for Absolute Volume
am:
e1fca1bacd
Change-Id: Ie0771c6e1607130851d9cbf4f69ddfad1e07013b
Marie Janssen [Wed, 17 May 2017 01:40:45 +0000 (18:40 -0700)]
Blacklist Kinivo BTC350 for Absolute Volume
The volume is erratic on the speakers when the speaker is reporting
linear increase, with decreases for higher volumes.
Test: check that absolute volume not used for Kinivo Speakers
Bug:
37872586
Change-Id: Ic5f409e8631bece66a75372b916faa9c104e2024
(cherry picked from commit
e1fca1bacd76bd4e2c6c00ea3e292633e0eae0ec)
Marie Janssen [Wed, 17 May 2017 01:40:45 +0000 (18:40 -0700)]
Blacklist Kinivo BTC350 for Absolute Volume
The volume is erratic on the speakers when the speaker is reporting
linear increase, with decreases for higher volumes.
Test: check that absolute volume not used for Kinivo Speakers
Bug:
37872586
Change-Id: Ic5f409e8631bece66a75372b916faa9c104e2024
Pavlin Radoslavov [Wed, 17 May 2017 05:53:07 +0000 (05:53 +0000)]
Disable MONO channel mode for LDAC
am:
4c30db6165
Change-Id: Icd6712a23b8140d0da669d6b974cf358b8bf3335
Pavlin Radoslavov [Wed, 17 May 2017 02:01:51 +0000 (02:01 +0000)]
Disable MONO channel mode for LDAC am:
f7e48dff99 am:
1338709b40
am:
6ee2066f76
Change-Id: I8263b5036dc399d39bd9f35ff95175d973c2e130
Pavlin Radoslavov [Wed, 17 May 2017 01:47:02 +0000 (01:47 +0000)]
Disable MONO channel mode for LDAC am:
f7e48dff99
am:
1338709b40
Change-Id: I468a18879c6513b63a5313886474037c0a95de44
Pavlin Radoslavov [Wed, 17 May 2017 01:45:33 +0000 (01:45 +0000)]
Disable MONO channel mode for LDAC
am:
f7e48dff99
Change-Id: I320fe419ed51b9b85944a485e022932fa36ff4de
Pavlin Radoslavov [Tue, 16 May 2017 23:20:23 +0000 (16:20 -0700)]
Disable MONO channel mode for LDAC
Bug:
38351937
Test: A2DP streaming to LDAC headset and switching MONO/STEREO in Settings
Change-Id: I20c5069fd5d104b9ebe767ae2728af7d7b2ae1d9
(cherry picked from commit
f7e48dff99ffbce639c37379976b8cd9519e1d06)
Pavlin Radoslavov [Tue, 16 May 2017 23:20:23 +0000 (16:20 -0700)]
Disable MONO channel mode for LDAC
Bug:
38351937
Test: A2DP streaming to LDAC headset and switching MONO/STEREO in Settings
Change-Id: I20c5069fd5d104b9ebe767ae2728af7d7b2ae1d9
Jakub Pawlowski [Tue, 16 May 2017 23:08:14 +0000 (23:08 +0000)]
Discover primary service by UUID for PTS tests (1/4)
am:
0de6324c21
Change-Id: Ib213c9c56046e66ad5b5abe2105c6f5037a3b06f
Jakub Pawlowski [Tue, 16 May 2017 20:55:56 +0000 (20:55 +0000)]
Discover primary service by UUID for PTS tests (1/4) am:
45aebe75f7 am:
b72096e5aa
am:
e73dbe453e
Change-Id: I962a490f407d7fd142c3a1a95b6405b4637d8726
Jakub Pawlowski [Tue, 16 May 2017 17:47:54 +0000 (10:47 -0700)]
Discover primary service by UUID for PTS tests (1/4)
Bug:
38123054
Test: manual
Change-Id: Ic97a964ca2a25a84c6abcf41acb0f3fb583488a2
(cherry picked from commit
45aebe75f75c1f93c396118bc39748fc0f4054c7)
Jakub Pawlowski [Tue, 16 May 2017 20:41:18 +0000 (20:41 +0000)]
Discover primary service by UUID for PTS tests (1/4) am:
45aebe75f7
am:
b72096e5aa
Change-Id: Ib02b37c8890027110b90bd04a0e164da4ed7ceb1
Jakub Pawlowski [Tue, 16 May 2017 20:29:24 +0000 (20:29 +0000)]
Discover primary service by UUID for PTS tests (1/4)
am:
45aebe75f7
Change-Id: Id2f05d32e1dfb8632c50707cb19af1a80a91f8da
Jakub Pawlowski [Tue, 16 May 2017 17:47:54 +0000 (10:47 -0700)]
Discover primary service by UUID for PTS tests (1/4)
Bug:
38123054
Test: manual
Change-Id: Ic97a964ca2a25a84c6abcf41acb0f3fb583488a2
Jakub Pawlowski [Mon, 15 May 2017 21:29:57 +0000 (21:29 +0000)]
Fix crash on GATT service unregistration
am:
1f021347c2
Change-Id: Ieca347b22684083fb0fce54ba0264cef42dc687d
Jakub Pawlowski [Mon, 15 May 2017 07:58:07 +0000 (00:58 -0700)]
Fix crash on GATT service unregistration
When SDP_MAX_RECORDS were reached in SDP db, which usually happen by
registering big number of GATT services, unregistration of a service was
causing a crash. This was because we moved from memory after the array
into last element.
Bug:
38265174
Test: manual
Change-Id: I7b0235213fb07c85dcc1245f1c840b41267521d5
(cherry picked from commit
0d892120359af4cd1af7f9c13897c1002eac59f3)
Jakub Pawlowski [Mon, 15 May 2017 18:40:02 +0000 (18:40 +0000)]
Fix crash on GATT service unregistration am:
0d89212035 am:
b479d98407
am:
105b752bb6
Change-Id: I859d43214c0dbf55d511d153408ceeb702dac659
Jakub Pawlowski [Mon, 15 May 2017 18:37:02 +0000 (18:37 +0000)]
Fix crash on GATT service unregistration am:
0d89212035
am:
b479d98407
Change-Id: I07f5aee7f419d5f0e6cefdfded61191e0a0edfac
Pavlin Radoslavov [Mon, 15 May 2017 18:34:14 +0000 (18:34 +0000)]
Don't ignore the A2DP Sink preferred SBC codec config
am:
436fcd74ad
Change-Id: Ia986b7b318b725fe1bfa5a61e2733b012c38feaf
Jakub Pawlowski [Mon, 15 May 2017 18:34:01 +0000 (18:34 +0000)]
Fix crash on GATT service unregistration
am:
0d89212035
Change-Id: I85f1bc7e5823c359f9f1d96b4fdf6ff12f35c127
Pavlin Radoslavov [Mon, 15 May 2017 18:34:00 +0000 (18:34 +0000)]
Set the RTP Header Marker bit selectively per A2DP codec
am:
b549bd7299
Change-Id: I4083f282808e49f56a2167d4f903d2cd88614a8f
Jakub Pawlowski [Mon, 15 May 2017 07:58:07 +0000 (00:58 -0700)]
Fix crash on GATT service unregistration
When SDP_MAX_RECORDS were reached in SDP db, which usually happen by
registering big number of GATT services, unregistration of a service was
causing a crash. This was because we moved from memory after the array
into last element.
Bug:
38265174
Test: manual
Change-Id: I7b0235213fb07c85dcc1245f1c840b41267521d5
Pavlin Radoslavov [Fri, 12 May 2017 10:02:08 +0000 (03:02 -0700)]
Don't ignore the A2DP Sink preferred SBC codec config
If the A2DP Sink device sends "Set Configuration" with its preferred
SBC configuration, try using that configuration when selecting
the codec parameters instead of the A2DP Sink SBC capability.
Test: A2DP streaming, PTS AVDTP Tests: TC_ACP_SRC_SIG_SMG_BV_18_C,
TC_ACP_SRC_SIG_SMG_BV_20_C, TC_ACP_SRC_SIG_SMG_BV_22_C
PTS A2DP Tests: A2DP/SRC/SET/BV-04-I, A2DP/SRC/SET/BV-06-I
Bug:
37723311
Bug:
35664023
Change-Id: I48e2aa664b899c1cda5df4d1f86f9cfa3a9a67f6
(cherry picked from commit
d62e522131e8646830f846fdcb292870d7fb9d7b)
Pavlin Radoslavov [Fri, 12 May 2017 08:16:10 +0000 (01:16 -0700)]
Set the RTP Header Marker bit selectively per A2DP codec
Add a mechanism to set the RTP Header Marker bit per codec.
Currently, the Marker bit is set only for AAC.
Test: A2DP streaming, PTS AVDTP tests: TC_ACP_SRC_TRA_BTR_BV_01_C,
TC_INT_SRC_SIG_SMG_BV_17_C, TC_INT_SRC_TRA_BTR_BV_01_C
Bug:
37723283
Change-Id: I9b8e77d44c750746c169df9628d5539ad2406b92
(cherry picked from commit
3b8391cd47dd0ea3e399f99a888f029de8c7d8c8)
Emil Lenngren [Fri, 12 May 2017 22:52:00 +0000 (22:52 +0000)]
Fix BLE white list issues am:
8451ad010e am:
3a8dc25485
am:
0d6d00719a
Change-Id: Iae7535f0a8e2a1ad5f4069e0eded8a38b9a273dc
Emil Lenngren [Fri, 12 May 2017 22:46:37 +0000 (22:46 +0000)]
Fix BLE white list issues am:
8451ad010e
am:
3a8dc25485
Change-Id: Iee978c8551798ec02503969821cdc9355e97a386
Emil Lenngren [Fri, 12 May 2017 22:39:20 +0000 (22:39 +0000)]
Fix BLE white list issues
am:
8451ad010e
Change-Id: Ic3a2f4f77f7d74f4021a68df3f996b5c9e0920c9
Emil Lenngren [Mon, 19 Dec 2016 19:21:19 +0000 (19:21 +0000)]
Fix BLE white list issues
Since Bluetooth 4.2 and errata ESR08 there may not be more than one
connection between two LE device addresses. Also the stack assumes
there is at maximum one connection to the same address. This patch
makes sure there are no connected devices in the white list when a
connection attempt is started. Since some (even 4.2) controllers don't
handle this correctly, currently this method is used regardless of
controller in this patch.
When the maximum L2CAP connections were reached and a new connection
was established to a device using auto connect, the stack hung and
would no longer create new connections until Bluetooth was restarted,
since the state change to BLE_CONN_IDLE was forgotten. This patch
resets the state correctly, and also never initiates a connection
unless there is space to avoid connect-disconnect loop.
There were also bugs in the background_connections hash map; memory was
not freed when an element was erased and an incorrect hash function
which used the pointer to a bd addr instead of the bd addr itself which
basically meant that elements were never removed. This patch removes
the dynamic memory allocation and uses a correct hash function.
There was a bug that might lead to that the white list was filled
beyond its maximum, due to the counter was updated on the HCI command
complete event, which might run too late. Now the space is instead
calculated based on what commands have been sent to the controller.
The address type of the address added to the white list must also be
tracked, otherwise it might be updated due to a BLE scan, and later the
wrong address is removed from the white list. This patch fixes this.
(Preferably 49-bit bd addrs should be used as identifier through the
whole stack but we're not there yet.)
There was a queue of size 10 with pending white list operations. That
queue got full if there was initially 10 devices in the white list,
then the 10 devices were removed and immediately after 10 other devices
were added. This patch removes the queue altogether by instead syncing
against the background_connections hash map.
Bug: https://code.google.com/p/android/issues/detail?id=219910
Test: stress-testing with a bunch of BLE devices and inspecting HCI log
Change-Id: I78de654ffbea5f4962a189caf984f7f2934e8fbe
Jakub Pawlowski [Fri, 12 May 2017 20:16:41 +0000 (20:16 +0000)]
Merge changes I1620be68,Ide2c2110 into oc-dev
am:
f342819dd7
Change-Id: Ifb5fc0173794c5a75325c95aa7f1c1cca64a3214
TreeHugger Robot [Fri, 12 May 2017 20:03:14 +0000 (20:03 +0000)]
Merge changes I1620be68,Ide2c2110 into oc-dev
* changes:
Improve GATT Server database handling.
GATT Server: check UUID
Joseph Pirozzo [Fri, 12 May 2017 19:09:05 +0000 (19:09 +0000)]
Merge "Disable output_sample.pcm" into oc-dev
am:
5b60886f7f
Change-Id: I953d7210a9a2718013fe328c70a27f83747d8e06
TreeHugger Robot [Fri, 12 May 2017 18:50:35 +0000 (18:50 +0000)]
Merge "Disable output_sample.pcm" into oc-dev
Pavlin Radoslavov [Fri, 12 May 2017 18:50:12 +0000 (18:50 +0000)]
Don't ignore the A2DP Sink preferred SBC codec config am:
d62e522131 am:
625da700c3
am:
2fbcae6e97
Change-Id: I6dd37775bea62186ebadf8a3b0fe62c7417a3ce6
Pavlin Radoslavov [Fri, 12 May 2017 18:50:07 +0000 (18:50 +0000)]
Set the RTP Header Marker bit selectively per A2DP codec am:
3b8391cd47 am:
4542775aaa
am:
edc5698e73
Change-Id: I475cdf4b32bd0f77f20314f6232402abc1c72777
Pavlin Radoslavov [Fri, 12 May 2017 18:48:06 +0000 (18:48 +0000)]
Don't ignore the A2DP Sink preferred SBC codec config am:
d62e522131
am:
625da700c3
Change-Id: I112318372ffefad47337aeb1f18c081552462a8b
Pavlin Radoslavov [Fri, 12 May 2017 18:48:02 +0000 (18:48 +0000)]
Set the RTP Header Marker bit selectively per A2DP codec am:
3b8391cd47
am:
4542775aaa
Change-Id: I477ec3ace25eff48c31bb1f587c75ce80036c8d7
Pavlin Radoslavov [Fri, 12 May 2017 18:46:06 +0000 (18:46 +0000)]
Don't ignore the A2DP Sink preferred SBC codec config
am:
d62e522131
Change-Id: I0b85499fa56336a735101eab886f52ea0fd8692a
Pavlin Radoslavov [Fri, 12 May 2017 18:46:02 +0000 (18:46 +0000)]
Set the RTP Header Marker bit selectively per A2DP codec
am:
3b8391cd47
Change-Id: I6678114e4e9c423b198aa15ee5da12cd973d46d7
Jakub Pawlowski [Tue, 9 May 2017 12:02:38 +0000 (05:02 -0700)]
Improve GATT Server database handling.
- use references instead of pointers where possible. Thanks to it we can
remove some reduntant null checks and simplify the code.
- use directly allocated memory instead of own buffers. Thanks to it the
stack uses around 12kb less of memory after startup.
- use list and vector from std library, instead of some hand-written
implementations.
This patch is a prerequisite for further server refactoring, that will
further reduce the space used, make unit-testing possible, and enable
proper handling of PTS GATT tests.
Test: sl4a GattReadTest
Bug:
38225928
Change-Id: I1620be682259ccb8f0c02754806e355e3f1ad0c1
(cherry picked from commit
6395f1547ed6179dcdeed392bd9909d18772fb25)
Jakub Pawlowski [Wed, 10 May 2017 11:39:26 +0000 (04:39 -0700)]
GATT Server: check UUID
Characteristic and descriptor can't use UUID equal to GATT Attribute
Types. Using such UUID would result in invalid GATT database, and
crashes during service discovery.
Test: manual
Bug:
38134693
Change-Id: Ide2c21109f885cbc79287452b1dabd3f532de385
(cherry picked from commit
671ad6679ce4b8edcdb7eaaee96bc5c66b557441)
Pavlin Radoslavov [Fri, 12 May 2017 10:02:08 +0000 (03:02 -0700)]
Don't ignore the A2DP Sink preferred SBC codec config
If the A2DP Sink device sends "Set Configuration" with its preferred
SBC configuration, try using that configuration when selecting
the codec parameters instead of the A2DP Sink SBC capability.
Test: A2DP streaming, PTS AVDTP Tests: TC_ACP_SRC_SIG_SMG_BV_18_C,
TC_ACP_SRC_SIG_SMG_BV_20_C, TC_ACP_SRC_SIG_SMG_BV_22_C
PTS A2DP Tests: A2DP/SRC/SET/BV-04-I, A2DP/SRC/SET/BV-06-I
Bug:
37723311
Bug:
35664023
Change-Id: I48e2aa664b899c1cda5df4d1f86f9cfa3a9a67f6