OSDN Git Service
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
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
Joseph Pirozzo [Thu, 11 May 2017 16:36:47 +0000 (09:36 -0700)]
Disable output_sample.pcm
Update include files to include bt_target.h as it has the necessary
defines to correctly allow bdroid_buildcfg.h to enable and disable
dumping to output_sample.pcm.
Bug:
38180732
Test: Stream Bluetooth audio to device and observe that
output_sample.pcm does not get written or appended to.
Change-Id: Ia7926f93a47489686d315e3c9abd1618cb8adda3
Jakub Pawlowski [Fri, 12 May 2017 08:30:19 +0000 (08:30 +0000)]
Improve GATT Server database handling. am:
6395f1547e am:
44087dbb60
am:
5e33de952d
Change-Id: I72771fee8aae8cef7fd9ff7bb3e210d81c31255f
Jakub Pawlowski [Fri, 12 May 2017 08:28:19 +0000 (08:28 +0000)]
Improve GATT Server database handling. am:
6395f1547e
am:
44087dbb60
Change-Id: I604c841e1bfe343f30cbb11c513a751f5a099fa6
Jakub Pawlowski [Fri, 12 May 2017 08:26:20 +0000 (08:26 +0000)]
Improve GATT Server database handling.
am:
6395f1547e
Change-Id: I1519dd0981b430a9a76a91126ad403616a856cea
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
Jacky Cheung [Fri, 12 May 2017 07:01:41 +0000 (07:01 +0000)]
DO NOT MERGE ANYWHERE Check ACL link on non-opportunistic connection creation am:
0ce25115e9 -s ours am:
6ba79a8618 -s ours
am:
635aef123e -s ours
Change-Id: Idacb26f185a5ef4856a7202fefc2684600680bd4
Joseph Pirozzo [Thu, 11 May 2017 23:48:03 +0000 (23:48 +0000)]
Disable output_sample.pcm am:
daf55dfda0 am:
7f264f124b
am:
c4d6ba9f1c
Change-Id: Ie2da4bb705ac671eddde54fa5f0dcac5d852e3dd
Joseph Pirozzo [Thu, 11 May 2017 23:38:18 +0000 (23:38 +0000)]
Disable output_sample.pcm am:
daf55dfda0
am:
7f264f124b
Change-Id: I7f5e128a92e21c9f72cd751970b355a96001ed2d
Jacky Cheung [Thu, 11 May 2017 23:26:31 +0000 (23:26 +0000)]
DO NOT MERGE ANYWHERE Check ACL link on non-opportunistic connection creation am:
0ce25115e9 -s ours am:
6ba79a8618 -s ours
am:
e9eddcf006 -s ours
Change-Id: Iefa88cb5913b7e2ac91e2cc031cb9229e3e5247c
Jacky Cheung [Thu, 11 May 2017 23:24:02 +0000 (23:24 +0000)]
DO NOT MERGE ANYWHERE Check ACL link on non-opportunistic connection creation am:
0ce25115e9 -s ours
am:
6ba79a8618 -s ours
Change-Id: Ibc77d01e1b480d60b04da5355242ba4071a9b064
Jacky Cheung [Thu, 11 May 2017 23:23:30 +0000 (23:23 +0000)]
DO NOT MERGE ANYWHERE Check ACL link on non-opportunistic connection creation am:
0ce25115e9 -s ours
am:
6ba79a8618 -s ours
Change-Id: Ic4e5bf9b9503fc72a6a081f58970c9998ba061ca
Jacky Cheung [Thu, 11 May 2017 23:19:01 +0000 (23:19 +0000)]
DO NOT MERGE ANYWHERE Check ACL link on non-opportunistic connection creation
am:
0ce25115e9 -s ours
Change-Id: I105198593ba9994002205567038778162dc9e6d0
Joseph Pirozzo [Thu, 11 May 2017 23:11:31 +0000 (23:11 +0000)]
Disable output_sample.pcm
am:
daf55dfda0
Change-Id: Ifdc79bb2e4c3530c50f985a8cc1a949e25266b11
Jacky Cheung [Wed, 10 May 2017 21:23:06 +0000 (14:23 -0700)]
DO NOT MERGE ANYWHERE Check ACL link on non-opportunistic connection creation
At the time of connection, the idle timeout could have been set to a fixed
value, which is likely to be related to the completion of service discovery
after bonding. A check on ACL link allows the idle timeout to be reset to no
timeout, which would eliminate local host disconnections observed due to
idle timeouts.
Bug:
37352720
Test: manual
Change-Id: Ie0b24b83020d502cf7c55421a27659215253b4d2
Joseph Pirozzo [Thu, 11 May 2017 16:36:47 +0000 (09:36 -0700)]
Disable output_sample.pcm
Update include files to include bt_target.h as it has the necessary
defines to correctly allow bdroid_buildcfg.h to enable and disable
dumping to output_sample.pcm.
Bug:
38180732
Test: Stream Bluetooth audio to device and observe that
output_sample.pcm does not get written or appended to.
Change-Id: Ia7926f93a47489686d315e3c9abd1618cb8adda3
Pavlin Radoslavov [Thu, 11 May 2017 02:22:33 +0000 (02:22 +0000)]
Merge "Removed A2DP_GetTrackBitsPerSample() API because it is not needed" am:
d93b54eada am:
4b6b594ae7
am:
a565477bbd
Change-Id: I42388f1660887a5bee11979c626ef4c8458d5907
Pavlin Radoslavov [Thu, 11 May 2017 02:20:31 +0000 (02:20 +0000)]
Merge "Removed A2DP_GetTrackBitsPerSample() API because it is not needed" am:
d93b54eada
am:
4b6b594ae7
Change-Id: I7046dacb5a93b995c1695059e56fbaa7847dc8dc
Pavlin Radoslavov [Thu, 11 May 2017 02:19:00 +0000 (02:19 +0000)]
Merge "Removed A2DP_GetTrackBitsPerSample() API because it is not needed"
am:
d93b54eada
Change-Id: I2c6324ab93de6bfd2f1cf2dc7cef52c6be955863
Treehugger Robot [Thu, 11 May 2017 02:10:07 +0000 (02:10 +0000)]
Merge "Removed A2DP_GetTrackBitsPerSample() API because it is not needed"
Jack He [Thu, 11 May 2017 02:03:46 +0000 (02:03 +0000)]
Merge changes from topic 'eSCO' am:
a5095e6eac am:
96b45e07ea
am:
52361b1cfa
Change-Id: Ie80f0f71b957f372f071d53a7bd6b161be0fc1c7
Jack He [Thu, 11 May 2017 02:03:43 +0000 (02:03 +0000)]
eSCO: Additional fix to get eSCO working for HFP and HSP (3/5) am:
400ac497f4 am:
1faf995c95
am:
cf38e2a20d
Change-Id: I28961521be04168c6b6c565f926df11dda336c70
Myles Watson [Thu, 11 May 2017 02:03:38 +0000 (02:03 +0000)]
eSCO: Remove BTM_WBS_INCLUDED from the stack (2/5) am:
3e634d6c1e am:
01e4189eb2
am:
0dab2433a4
Change-Id: If276d6bbe480c29028a0eb0e30e89c948e977fc6
Mudumba Ananth [Thu, 11 May 2017 02:03:34 +0000 (02:03 +0000)]
eSCO: BT 4.1 Enhanced SCO command (1/5) am:
57f6508cf7 am:
86f1b61e61
am:
8b0d1f793c
Change-Id: Ib635272bc4cb38ff95bd57e80d0e9e9f08604917
Jack He [Thu, 11 May 2017 02:01:49 +0000 (02:01 +0000)]
Merge changes from topic 'eSCO' am:
a5095e6eac
am:
96b45e07ea
Change-Id: I5518a14dfa62f3aa64a9d9e17054219ffe19d99b
Jack He [Thu, 11 May 2017 02:01:45 +0000 (02:01 +0000)]
eSCO: Additional fix to get eSCO working for HFP and HSP (3/5) am:
400ac497f4
am:
1faf995c95
Change-Id: Id6089050ae0f8170c1461f61f24ea2ed2369d87e
Myles Watson [Thu, 11 May 2017 02:01:41 +0000 (02:01 +0000)]
eSCO: Remove BTM_WBS_INCLUDED from the stack (2/5) am:
3e634d6c1e
am:
01e4189eb2
Change-Id: Ief7ca14cda07fa76c94e1e31ef96b3f054cc96f4
Mudumba Ananth [Thu, 11 May 2017 02:01:36 +0000 (02:01 +0000)]
eSCO: BT 4.1 Enhanced SCO command (1/5) am:
57f6508cf7
am:
86f1b61e61
Change-Id: I78633f7c19e6b613bb352df79d6b15a23d6c1908
Jack He [Thu, 11 May 2017 01:59:52 +0000 (01:59 +0000)]
Merge changes from topic 'eSCO'
am:
a5095e6eac
Change-Id: I6ec9013bc90d038078e33e271e77125a45689f1d
Jack He [Thu, 11 May 2017 01:59:40 +0000 (01:59 +0000)]
eSCO: Additional fix to get eSCO working for HFP and HSP (3/5)
am:
400ac497f4
Change-Id: I2590f334f411a43ebbd5198ab964d776f096e249
Myles Watson [Thu, 11 May 2017 01:59:29 +0000 (01:59 +0000)]
eSCO: Remove BTM_WBS_INCLUDED from the stack (2/5)
am:
3e634d6c1e
Change-Id: I99fff15789f389fe71f140db81bceac3bac42b71
Mudumba Ananth [Thu, 11 May 2017 01:59:16 +0000 (01:59 +0000)]
eSCO: BT 4.1 Enhanced SCO command (1/5)
am:
57f6508cf7
Change-Id: Ic45dc0c4bae5c40f3d144246efe1d3e2603e8b4b
Treehugger Robot [Thu, 11 May 2017 01:53:44 +0000 (01:53 +0000)]
Merge changes from topic 'eSCO'
* changes:
eSCO: Format changes to original vendor patch (4/5)
eSCO: Additional fix to get eSCO working for HFP and HSP (3/5)
eSCO: Remove BTM_WBS_INCLUDED from the stack (2/5)
eSCO: BT 4.1 Enhanced SCO command (1/5)
Marie Janssen [Thu, 11 May 2017 01:24:16 +0000 (01:24 +0000)]
Merge "btif: GetItemAttributes can return no attributes" into oc-dev
am:
1f7d8e2299
Change-Id: I3a269ff1629c076eca5568de08986727d0ff61ba
Jack He [Thu, 11 May 2017 01:23:58 +0000 (01:23 +0000)]
Fix broken linux build
am:
3f122786c5
Change-Id: I55f253a86e4686bc81cd11137ca90976fc4bbe40
Jack He [Thu, 11 May 2017 01:23:44 +0000 (01:23 +0000)]
Remove include for log/log.h in l2c_main.cc
am:
8db5514d92
Change-Id: I603aa47f5ead053d27b569149bb16dc2fb65dc55
Andre Eisenbach [Thu, 11 May 2017 01:18:17 +0000 (01:18 +0000)]
Merge "HID: Add support for Set Idle and Get Idle commands (2/4)" am:
642e53b17f am:
9cdb6114c6
am:
b798c2fd79
Change-Id: I01af1fb37a60a81c0d042555611eb2e32d0bbc4d
Andre Eisenbach [Thu, 11 May 2017 01:11:04 +0000 (01:11 +0000)]
Merge "HID: Add support for Set Idle and Get Idle commands (2/4)" am:
642e53b17f
am:
9cdb6114c6
Change-Id: I785f115e9933a5753286c2b1662e47a868d6e3c9
TreeHugger Robot [Thu, 11 May 2017 01:03:30 +0000 (01:03 +0000)]
Merge "btif: GetItemAttributes can return no attributes" into oc-dev
Andre Eisenbach [Thu, 11 May 2017 00:44:03 +0000 (00:44 +0000)]
Merge "HID: Add support for Set Idle and Get Idle commands (2/4)"
am:
642e53b17f
Change-Id: I6087d0517494ff36810c71c5e3ffa1d337c4f9f2