OSDN Git Service
Hansong Zhang [Tue, 2 Oct 2018 11:24:18 +0000 (04:24 -0700)]
[automerger skipped] DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist am:
d65f697c01
am:
c4776fee1d -s ours
Change-Id: I99d0e526992bafdd37a2c4313f2ae8b3ac535614
Hansong Zhang [Tue, 2 Oct 2018 11:24:08 +0000 (04:24 -0700)]
Hearing Aid: Clean up GATT on disconnect am:
1746ffd2e0
am:
1b93f6442e
Change-Id: Ia5e5f55bbb41dd340b0f2e093d17dcb468de4be7
Jakub Pawlowski [Tue, 2 Oct 2018 11:23:49 +0000 (04:23 -0700)]
[automerger skipped] Send volume just once when starting the stream. am:
53fdcf8645
am:
53f1461c7d -s ours
Change-Id: Ia24f220f06f6dc5c6fe84e77fc1fe8d121bd29e8
Stanley Tng [Tue, 2 Oct 2018 11:23:27 +0000 (04:23 -0700)]
[automerger skipped] Clear connection update pending flag when disconnected am:
5b114433af -s ours
am:
5318f4a009 -s ours
Change-Id: Ie9e4173a0c94eb4a6546830d789058cabf444ef7
Stanley Tng [Tue, 2 Oct 2018 11:23:05 +0000 (04:23 -0700)]
[automerger skipped] Hearing Aid: codec and connection interval switching am:
bd592d5c16 -s ours
am:
7bd444b8b0 -s ours
Change-Id: I453297f16ee9454b3b3251dec520164de5edc2be
Jakub Pawlowski [Tue, 2 Oct 2018 11:22:43 +0000 (04:22 -0700)]
[automerger skipped] Hearing Aid - codec switching am:
1934566cba -s ours
am:
d2c619c37d -s ours
Change-Id: If01c338553d98c2d50f748d3c83febb6b29da535
Hansong Zhang [Tue, 2 Oct 2018 10:55:56 +0000 (03:55 -0700)]
DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist
am:
d65f697c01
Change-Id: I02aca3c8b20df345b01e1e35bb690803c3c56554
Hansong Zhang [Tue, 2 Oct 2018 10:55:44 +0000 (03:55 -0700)]
Hearing Aid: Clean up GATT on disconnect
am:
1746ffd2e0
Change-Id: Ide9eff1e203c4a21aaca375edc71d1de51eb98b6
Jakub Pawlowski [Tue, 2 Oct 2018 10:55:32 +0000 (03:55 -0700)]
Send volume just once when starting the stream.
am:
53fdcf8645
Change-Id: I1e6523b50fa8c98355e948bf1be1f8080ec7745d
Stanley Tng [Tue, 2 Oct 2018 10:55:18 +0000 (03:55 -0700)]
[automerger skipped] Clear connection update pending flag when disconnected
am:
5b114433af -s ours
Change-Id: I8929d1e4f3b61e75590ccd7944a3332771d92e7c
Stanley Tng [Tue, 2 Oct 2018 10:55:04 +0000 (03:55 -0700)]
[automerger skipped] Hearing Aid: codec and connection interval switching
am:
bd592d5c16 -s ours
Change-Id: I0554002f4166303db4ef7f0074ab5406b30bbbef
Jakub Pawlowski [Tue, 2 Oct 2018 10:54:50 +0000 (03:54 -0700)]
[automerger skipped] Hearing Aid - codec switching
am:
1934566cba -s ours
Change-Id: I0fc8abbd0af75ab8980c479d82971dda73ed5130
Hansong Zhang [Mon, 24 Sep 2018 22:03:09 +0000 (15:03 -0700)]
DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist
Allow Java layer to add a hearing aid device to white list or remove
from white list
Bug:
116317072
Bug:
115365334
Test: connect to a pair with one device off
Change-Id: Iac5df8f371fb39fade4493d2da8226f026545fb3
Hansong Zhang [Fri, 28 Sep 2018 20:13:16 +0000 (13:13 -0700)]
Merge "Hearing Aid: Clean up GATT on disconnect" am:
36f0889fc6 am:
3174bf630d
am:
315194340f
Change-Id: Iaf271c78cadf7325ef43cc32026bb220b0d35f40
Hansong Zhang [Fri, 28 Sep 2018 19:48:43 +0000 (12:48 -0700)]
Merge "Hearing Aid: Clean up GATT on disconnect" am:
36f0889fc6
am:
3174bf630d
Change-Id: I3809c6886d18a4c6024ed83255c466c6d9f028d9
Hansong Zhang [Fri, 28 Sep 2018 19:35:53 +0000 (12:35 -0700)]
Merge "Hearing Aid: Clean up GATT on disconnect"
am:
36f0889fc6
Change-Id: I6caf6bc8bef9324f1675f5aa62024b97c6f6b5de
Hansong Zhang [Thu, 27 Sep 2018 05:02:38 +0000 (22:02 -0700)]
Hearing Aid: Clean up GATT on disconnect
When user requests Disconnect(), after disconnecting GATT,
OnGattDisconnected() never cleans up GATT queue, because the
corresponding device is already removed from HearingDevices. We need to
clean up the queue before connecting the same device again. Without the
fix, sometimes ACL is connected, but the host failed to read GATT
characteristic to open COC. Also clean up connection update status
during disconnect
Bug:
116317072
Bug:
115365334
Test: connect to both devices -> disconnect -> connect, and repeat
Change-Id: I158b19b3d1f2cb2123ec554eb1ffe8c842df998e
Treehugger Robot [Fri, 28 Sep 2018 19:08:21 +0000 (19:08 +0000)]
Merge "Hearing Aid: Clean up GATT on disconnect"
Jakub Pawlowski [Fri, 28 Sep 2018 14:58:13 +0000 (07:58 -0700)]
Merge "Rename functions related to BLE scan cache" am:
68e05e155e am:
d57ba35091
am:
94d84c02f5
Change-Id: I14a298abb5eb7662d0c9f4fcb6ca99dafd452f19
Jakub Pawlowski [Fri, 28 Sep 2018 14:47:38 +0000 (07:47 -0700)]
Merge "Rename functions related to BLE scan cache" am:
68e05e155e
am:
d57ba35091
Change-Id: Iaee049d1d210546e5c4f93066cf55d746a1190b7
Jakub Pawlowski [Fri, 28 Sep 2018 14:43:31 +0000 (07:43 -0700)]
Merge "Rename functions related to BLE scan cache"
am:
68e05e155e
Change-Id: I55adaa8067a2ae50682d3c53814720128a0f1b2e
Treehugger Robot [Fri, 28 Sep 2018 14:22:08 +0000 (14:22 +0000)]
Merge "Rename functions related to BLE scan cache"
Jakub Pawlowski [Wed, 8 Aug 2018 13:19:58 +0000 (15:19 +0200)]
Rename functions related to BLE scan cache
They are not related to GATT, update naming.
Test: compilation
Bug:
67058417
Change-Id: Ia84ed98e02fbc04ecfde979f860b8766b0018218
Hansong Zhang [Thu, 27 Sep 2018 05:02:38 +0000 (22:02 -0700)]
Hearing Aid: Clean up GATT on disconnect
When user requests Disconnect(), after disconnecting GATT,
OnGattDisconnected() never cleans up GATT queue, because the
corresponding device is already removed from HearingDevices. We need to
clean up the queue before connecting the same device again. Without the
fix, sometimes ACL is connected, but the host failed to read GATT
characteristic to open COC. Also clean up connection update status
during disconnect
Bug:
115365334
Test: connect to both devices -> disconnect -> connect, and repeat
Change-Id: I158b19b3d1f2cb2123ec554eb1ffe8c842df998e
Jack He [Fri, 28 Sep 2018 00:54:51 +0000 (17:54 -0700)]
Add TEST_MAPPING to system/bt am:
37b717c612 am:
5756b395a5
am:
3433d9b40a
Change-Id: I83c2708458c60c6bde9b2eaed8150a138a14e470
Jack He [Fri, 28 Sep 2018 00:48:20 +0000 (17:48 -0700)]
Add TEST_MAPPING to system/bt am:
37b717c612
am:
5756b395a5
Change-Id: I7bf8295c1a69946d1426243633d22403140e177b
Jack He [Fri, 28 Sep 2018 00:44:09 +0000 (17:44 -0700)]
Add TEST_MAPPING to system/bt
am:
37b717c612
Change-Id: Iae641e8d55d26577491853eca958347744638ba9
Hansong Zhang [Thu, 27 Sep 2018 22:44:34 +0000 (15:44 -0700)]
Merge "GATTC: Use hex for conn_id in log" am:
71113b44c3 am:
2a6c1cbbe5
am:
1f655d9fd1
Change-Id: I4e58073cc0eab511947d3365061936a14a98a9e7
Hansong Zhang [Thu, 27 Sep 2018 22:35:19 +0000 (15:35 -0700)]
Merge "GATTC: Use hex for conn_id in log" am:
71113b44c3
am:
2a6c1cbbe5
Change-Id: If3fec0b9b153f907039e67c5f0a24652c3674d51
Hansong Zhang [Thu, 27 Sep 2018 22:27:41 +0000 (15:27 -0700)]
Merge "GATTC: Use hex for conn_id in log"
am:
71113b44c3
Change-Id: Iabf9065e751f4090bf676fe109ef23a4310b29d6
Jack He [Wed, 29 Aug 2018 01:28:55 +0000 (18:28 -0700)]
Add TEST_MAPPING to system/bt
* Add "postsubmit" test group to TEST_MAPPING in system/bt
* Developer can run tests mannually in system/bt via:
system/bt$ atest :postsubmit
* Remove legacy configuration files spread across system/bt
* Created unified configuration file system/bt/AndroidTestTemplate.xml
and add it to the default build config so that developers don't have
to configure it
Bug:
113359343
Test: atest :postsubmit
Change-Id: I0fdd55b47ef176b5c4ce3d2cd217ffa67cf9bc23
Treehugger Robot [Thu, 27 Sep 2018 22:16:39 +0000 (22:16 +0000)]
Merge "GATTC: Use hex for conn_id in log"
Hemant Gupta [Thu, 27 Sep 2018 21:15:20 +0000 (14:15 -0700)]
Merge "HID: Free timer after removing device" am:
1de8ba51e1 am:
b914f16c28
am:
afc61f661d
Change-Id: I72edaa52710a018eb028e93ab12bee717c3ad2b2
Hemant Gupta [Thu, 27 Sep 2018 21:10:34 +0000 (14:10 -0700)]
Merge "HID: Free timer after removing device" am:
1de8ba51e1
am:
b914f16c28
Change-Id: I187ba7b73e0f8961e1f83dbb754c87a6236329c3
Hemant Gupta [Thu, 27 Sep 2018 21:03:24 +0000 (14:03 -0700)]
Merge "HID: Free timer after removing device"
am:
1de8ba51e1
Change-Id: Ib99739a3e08926b91e0df57564e690eb1604f05c
Treehugger Robot [Thu, 27 Sep 2018 20:47:50 +0000 (20:47 +0000)]
Merge "HID: Free timer after removing device"
Ajay Panicker [Thu, 27 Sep 2018 19:51:26 +0000 (12:51 -0700)]
Move Bluetooth to using C++17 am:
96bcf14a65 am:
6b3ecc5ff1
am:
1137f972c4
Change-Id: I0786f258c9bcacea0e15f808e6e7933a8cab20d5
Ajay Panicker [Thu, 27 Sep 2018 19:45:34 +0000 (12:45 -0700)]
Move Bluetooth to using C++17 am:
96bcf14a65
am:
6b3ecc5ff1
Change-Id: I2995e17b065557f7d5571955cec1b0443fff8ddc
Ajay Panicker [Thu, 27 Sep 2018 19:37:16 +0000 (12:37 -0700)]
Move Bluetooth to using C++17
am:
96bcf14a65
Change-Id: I0cd45059f7e3befa275b25be65ea88947c08b3b5
Hansong Zhang [Thu, 27 Sep 2018 00:42:40 +0000 (17:42 -0700)]
GATTC: Use hex for conn_id in log
For host conn_id, use hex format
Test: manual
Change-Id: I7d7e690a1dbe0665b827c59d104540eafa45d426
Hemant Gupta [Thu, 27 Sep 2018 16:05:46 +0000 (21:35 +0530)]
HID: Free timer after removing device
Timer conn.process_repage_timer is being freed in HID_HostDeregister
which causes use after free condition in HID_HostRemoveDev->
HID_HostCloseDev.
Fix:
Call alarm_free after HID_HostRemoveDev in HID_HostDeregister
Test:
Code analysis
Bug:
116774368
Change-Id: Iddecd126716a5660f4c37ddc917bacee84342297
Ajay Panicker [Mon, 17 Sep 2018 18:35:24 +0000 (11:35 -0700)]
Move Bluetooth to using C++17
C++ 17 has a bunch of features that will help us refactor the Bluetooth
stack to be much more safe and stable.
Bug:
115895445
Test: Compile and testtracker/201115
Change-Id: Ia1e8e179fa1df116969606d119cb8abe11f44761
Chih-hung Hsieh [Thu, 27 Sep 2018 04:56:20 +0000 (21:56 -0700)]
Merge "Add noexcept to move constructors and assignment operators." am:
2e3fa05261 am:
6901c69166
am:
5b2a470647
Change-Id: I5234c656ca138a8135fec0419c01dab95de651e0
Chih-hung Hsieh [Thu, 27 Sep 2018 04:51:42 +0000 (21:51 -0700)]
Merge "Add noexcept to move constructors and assignment operators." am:
2e3fa05261
am:
6901c69166
Change-Id: I8a77d6538f8e41e5a81358548d92b02e0544f3a8
Ugo Yu [Thu, 27 Sep 2018 04:51:01 +0000 (21:51 -0700)]
Merge "Use maximum SSR timeout value when A2DP is streaming" am:
3dd799fd1a am:
3a0bcd481f
am:
d3914cf727
Change-Id: Ia4eced63da15480ddb3bdb3044bf5407226577eb
Chih-hung Hsieh [Thu, 27 Sep 2018 04:44:30 +0000 (21:44 -0700)]
Merge "Add noexcept to move constructors and assignment operators."
am:
2e3fa05261
Change-Id: Ief6685c41f95433dfa2ac1acd75f18b8895b5da1
Ugo Yu [Thu, 27 Sep 2018 04:35:42 +0000 (21:35 -0700)]
Merge "Use maximum SSR timeout value when A2DP is streaming" am:
3dd799fd1a
am:
3a0bcd481f
Change-Id: Ia03c912910f08fa13c1cb90f3ed3eafe81c155f8
Chih-hung Hsieh [Thu, 27 Sep 2018 04:33:34 +0000 (04:33 +0000)]
Merge "Add noexcept to move constructors and assignment operators."
Ugo Yu [Thu, 27 Sep 2018 04:20:09 +0000 (21:20 -0700)]
Merge "Use maximum SSR timeout value when A2DP is streaming"
am:
3dd799fd1a
Change-Id: Iafa7a776e8e844e2265d68eb1028402e4957afbf
Treehugger Robot [Thu, 27 Sep 2018 01:58:13 +0000 (01:58 +0000)]
Merge "Use maximum SSR timeout value when A2DP is streaming"
Pavlin Radoslavov [Wed, 26 Sep 2018 23:42:13 +0000 (16:42 -0700)]
Merge "Remove obsoleted Coverity-related comment" am:
21cd29ca65 am:
826f10ca20
am:
845fb3b55b
Change-Id: I5621b142b32d11ce862ffe69674a03f82529ad68
Pavlin Radoslavov [Wed, 26 Sep 2018 23:35:58 +0000 (16:35 -0700)]
Merge "Remove obsoleted Coverity-related comment" am:
21cd29ca65
am:
826f10ca20
Change-Id: Id112020d622e87180feead6c3c6872314c537237
Pavlin Radoslavov [Wed, 26 Sep 2018 23:31:56 +0000 (16:31 -0700)]
Merge "Remove obsoleted Coverity-related comment"
am:
21cd29ca65
Change-Id: I98552cebb24e6b2784dc4771e4ceb213744b9aea
Treehugger Robot [Wed, 26 Sep 2018 23:18:32 +0000 (23:18 +0000)]
Merge "Remove obsoleted Coverity-related comment"
Jakub Pawlowski [Mon, 24 Sep 2018 14:43:59 +0000 (16:43 +0200)]
Send volume just once when starting the stream.
The volume is in the Start command already, no need to send it in a
separate command.
Bug:
116317072
Bug:
116044083
Bug:
116145308
Test: play music, pause, adjust volume, start playing again, verify
playing was re-started with proper volume level.
Change-Id: I2a900b03a35670de4a265184f333517db17497d8
Merged-In: I76f4b6a9302dd84781195475de50374e9c30700f
Stanley Tng [Wed, 22 Aug 2018 21:43:57 +0000 (14:43 -0700)]
Clear connection update pending flag when disconnected
For the hearing aid profile and when we get disconnection
while there is a pending connection update, then clear the flag so that
the next connection update can proceed.
Bug:
116317072
Bug:
116044083
Bug:
112050972
Test: Manual test to check for regressions
Change-Id: I54635a680cf276cf6c9f94520943c3efa97e77ec
Merged-In: Ib7d281fa6e50e0ee7cf75b552d829e2e8d4134ba
Stanley Tng [Sat, 9 Jun 2018 00:09:00 +0000 (17:09 -0700)]
Hearing Aid: codec and connection interval switching
Added support to switch the LE Connection Interval between 10 msec and
20 msec. Uses the "persist.bluetooth.hearingaid.interval" to configure.
Bug:
116317072
Bug:
116044083
Test: Manually use hearing aid devices and switches between 10 msec and
20 msec connection interval
Bug:
79579786
Change-Id: Iec15a0c9f76afe265368fd90662ffe60a29fb27b
Merged-In: I982002ac9a41969cda5dec73332b27b3142d7426
Jakub Pawlowski [Tue, 10 Apr 2018 07:16:53 +0000 (00:16 -0700)]
Hearing Aid - codec switching
StartSendingAudio internally sets the codec to the HearingAidAudioSource.
OnDeviceAvailable callback triggers audio framework to grab codec
configuration from HearingAidAudioSource. Those calls must be made in proper
order, otherwise audio framework will grab bad codec configuration.
This patch also remove default codec configuration, and crash if codec
configuration is not done correctly.
Bug:
116317072
Bug:
116044083
Test: use hearing aid supporting 24kHz codec
Change-Id: I9419d58fa8728fc8e0f0c2d2ed8d8d741309a9a3
Merged-In: I9419d58fa8728fc8e0f0c2d2ed8d8d741309a9a3
Merged-In: I8ce09c709a9cb4e79413a99fc344dffe824bc707
Ugo Yu [Thu, 13 Sep 2018 12:12:36 +0000 (20:12 +0800)]
Use maximum SSR timeout value when A2DP is streaming
* Add a new SSR entry BTA_DM_PM_SSR4 with maximum
remote/local timeout value.
* Use BTA_DM_PM_SSR4 when A2DP is streaming to prevent
phone enter sniff subrating mode.
Bug:
113496412
Test: Manually
Change-Id: I194ef9fdb4dd38eab67ff20e1bb9cab47edbfe8f
Myles Watson [Wed, 26 Sep 2018 00:56:39 +0000 (17:56 -0700)]
Merge "bta: Pass the correct UUID array size in bta_ag_do_disc" into pi-dev am:
611a85c2f5
am:
6080600036
Change-Id: Ie306ad82ad972c4d1b766d97c197529adfbd98a2
Myles Watson [Wed, 26 Sep 2018 00:51:15 +0000 (17:51 -0700)]
Merge "bta: Pass the correct UUID array size in bta_ag_do_disc" into pi-dev
am:
611a85c2f5
Change-Id: I38dc92dca41ed5e6e174ac82acc1817e5123a1af
TreeHugger Robot [Wed, 26 Sep 2018 00:45:04 +0000 (00:45 +0000)]
Merge "bta: Pass the correct UUID array size in bta_ag_do_disc" into pi-dev
Vasu Nori [Tue, 25 Sep 2018 23:48:15 +0000 (16:48 -0700)]
Add new hidden API to return SDP record's MapSupportedFeatures field. That field is documented in Bluetooth MAP 1.4 spec, page 114. Spec is here: shortn/_zfoIrfbIzR am:
f2b03b49ac am:
2f5f6970e4
am:
6607fcd751
Change-Id: I457b458b234becdae553ffadfd15b32687f93333
Vasu Nori [Tue, 25 Sep 2018 23:22:39 +0000 (16:22 -0700)]
Add new hidden API to return SDP record's MapSupportedFeatures field. That field is documented in Bluetooth MAP 1.4 spec, page 114. Spec is here: shortn/_zfoIrfbIzR am:
f2b03b49ac
am:
2f5f6970e4
Change-Id: I0477b12698901a8e411e576d106ee87a67d9f02c
Vasu Nori [Tue, 25 Sep 2018 23:14:31 +0000 (16:14 -0700)]
Add new hidden API to return SDP record's MapSupportedFeatures field. That field is documented in Bluetooth MAP 1.4 spec, page 114. Spec is here: shortn/_zfoIrfbIzR
am:
f2b03b49ac
Change-Id: I17d43783874233dca4e58965c5e446f60552ff1f
Vasu Nori [Sat, 18 Aug 2018 00:28:11 +0000 (17:28 -0700)]
Add new hidden API to return SDP record's MapSupportedFeatures field.
That field is documented in Bluetooth MAP 1.4 spec, page 114.
Spec is here: http://shortn/_zfoIrfbIzR
Bug:
111614861
Test: tested w/ KitchenSink App
Change-Id: I89903c386d97934ec7b9c80333ecc6a6d560cbec
Chih-Hung Hsieh [Tue, 25 Sep 2018 21:29:59 +0000 (14:29 -0700)]
Add noexcept to move constructors and assignment operators.
Bug:
116614593
Test: build with WITH_TIDY=1
Change-Id: I4adaf89db5001e9b627beac8160f62b50513d18f
Pavlin Radoslavov [Tue, 25 Sep 2018 18:18:34 +0000 (11:18 -0700)]
Remove obsoleted Coverity-related comment
Bug:
27078725
Test: Code compilation
Change-Id: I9398f0354e54cc6a754ed46b05b9f7cef09add8f
Hansong Zhang [Tue, 25 Sep 2018 05:06:10 +0000 (22:06 -0700)]
Merge changes I737a864e,Idc41b2a5 am:
af09b4eae2 am:
7d92087ec1
am:
3ffd914e3b
Change-Id: I5674f5aa2b13b19aa26ee39f29a154090da97d88
Hansong Zhang [Tue, 25 Sep 2018 04:58:55 +0000 (21:58 -0700)]
Merge changes I737a864e,Idc41b2a5 am:
af09b4eae2
am:
7d92087ec1
Change-Id: I15c1c4e86ac331d62a29fbacf24ca5363138ccd9
Hansong Zhang [Tue, 25 Sep 2018 04:52:59 +0000 (21:52 -0700)]
Merge changes I737a864e,Idc41b2a5
am:
af09b4eae2
Change-Id: Icdf4f89ec9d36f680f20d54633bd18d23b88c0fb
Ugo Yu [Tue, 25 Sep 2018 04:46:22 +0000 (21:46 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-dev am:
bc5bd697c9 -s ours am:
77175af80b -s ours am:
8be1e6fac4 -s ours am:
8ad4a12949 -s ours
am:
ad2d2a130d -s ours
Change-Id: I9399a431ade1519d04869f00106d83082027c469
Treehugger Robot [Tue, 25 Sep 2018 04:41:08 +0000 (04:41 +0000)]
Merge changes I737a864e,Idc41b2a5
* changes:
Timer: Don't run new task at old timepoint
Timer: Separate code path for single and periodic
Ugo Yu [Tue, 25 Sep 2018 04:31:38 +0000 (21:31 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-dev am:
bc5bd697c9 -s ours am:
77175af80b -s ours am:
8be1e6fac4 -s ours
am:
8ad4a12949 -s ours
Change-Id: I6b666e41da9ef95fa5a99284833dece3e59e6542
Ugo Yu [Tue, 25 Sep 2018 04:26:29 +0000 (21:26 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-dev am:
bc5bd697c9 -s ours am:
77175af80b -s ours
am:
8be1e6fac4 -s ours
Change-Id: Ic52691d8f86bce01ca6e0b42e512082cb20566d8
Ugo Yu [Tue, 25 Sep 2018 04:21:39 +0000 (21:21 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-dev am:
bc5bd697c9 -s ours
am:
77175af80b -s ours
Change-Id: Ic285392e964bd2f5d20f9d38bd79725512d4ea27
Ugo Yu [Tue, 25 Sep 2018 04:10:21 +0000 (21:10 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-dev
am:
bc5bd697c9 -s ours
Change-Id: I35806d7afb20585bd339bfc333769cd76559f862
TreeHugger Robot [Tue, 25 Sep 2018 03:52:21 +0000 (03:52 +0000)]
Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-dev
Hansong Zhang [Thu, 20 Sep 2018 17:15:12 +0000 (10:15 -0700)]
Timer: Don't run new task at old timepoint
* Fix a race condition that the task is just finished but IsScheduled
is true
* Fix a bug where cancelling the old task will make new task run at
the previous task's scheduled timepoint
* Protect racing read/write to message_loop_thread_ in RunTask() and
Cancel() by storing a local reference to message_loop_thread_ in
RunTask()
Bug:
116081383
Test: Run bluetooth_test_common.TimerTest
reschedule_task_dont_invoke_new_task_early
schedule_task
for multiple times
Change-Id: I737a864e1b061adbcd41245711e0d3e8adf448d4
Jakub Pawlowski [Mon, 24 Sep 2018 20:52:55 +0000 (13:52 -0700)]
Merge "Send volume just once when starting the stream." am:
029945f9f5 am:
09365b47d2
am:
0db9905ac5
Change-Id: I76f4b6a9302dd84781195475de50374e9c30700f
Jakub Pawlowski [Mon, 24 Sep 2018 20:49:40 +0000 (13:49 -0700)]
Merge "Send volume just once when starting the stream." am:
029945f9f5
am:
09365b47d2
Change-Id: If93f1b36295df47d42905abcf411891a104b7fa7
Jakub Pawlowski [Mon, 24 Sep 2018 20:43:23 +0000 (13:43 -0700)]
Merge "Send volume just once when starting the stream."
am:
029945f9f5
Change-Id: I8c64f2325849333c91010e0f0fdb5239d88187d0
Treehugger Robot [Mon, 24 Sep 2018 20:33:51 +0000 (20:33 +0000)]
Merge "Send volume just once when starting the stream."
Jakub Pawlowski [Mon, 24 Sep 2018 14:43:59 +0000 (16:43 +0200)]
Send volume just once when starting the stream.
The volume is in the Start command already, no need to send it in a
separate command.
Bug:
116145308
Test: play music, pause, adjust volume, start playing again, verify
playing was re-started with proper volume level.
Change-Id: I2a900b03a35670de4a265184f333517db17497d8
Ugo Yu [Sat, 22 Sep 2018 02:07:15 +0000 (19:07 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-mr1-dev am:
3298d1457d -s ours am:
e3bf088499
am:
4c40b1d51f -s ours
Change-Id: I6757951a6b490553d12d255d7d4169cdb475738b
Ugo Yu [Sat, 22 Sep 2018 01:55:18 +0000 (18:55 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-mr1-dev am:
3298d1457d -s ours
am:
e3bf088499
Change-Id: I16e8696901ecde8e0b522e7b76d1b2798988dab0
Ugo Yu [Sat, 22 Sep 2018 01:46:51 +0000 (18:46 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-mr1-dev
am:
3298d1457d -s ours
Change-Id: Ib30226371223485479de44ac15466a4a048f9966
TreeHugger Robot [Sat, 22 Sep 2018 01:35:20 +0000 (01:35 +0000)]
Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-mr1-dev
Ugo Yu [Sat, 22 Sep 2018 01:26:13 +0000 (18:26 -0700)]
Merge "Check SDU lower bound before allocate p_data" into pi-dev am:
895f3665be
am:
6a5485b09b
Change-Id: Ib959cc2ee8d3c8ab070e103c9f9f4c09c1fb756e
Ugo Yu [Sat, 22 Sep 2018 01:10:53 +0000 (18:10 -0700)]
Merge "Check SDU lower bound before allocate p_data" into pi-dev
am:
895f3665be
Change-Id: I1087769863865abf07ee12a3594d17b9a8a60113
TreeHugger Robot [Sat, 22 Sep 2018 01:00:32 +0000 (01:00 +0000)]
Merge "Check SDU lower bound before allocate p_data" into pi-dev
Hansong Zhang [Thu, 20 Sep 2018 17:15:12 +0000 (10:15 -0700)]
Timer: Separate code path for single and periodic
* Add helper RunSingleTask() and RunPeriodicTask() to handle two cases
separately
* In RunTask(), check that it must run on specified message loop thread
Bug:
116081383
Test: Run bluetooth_test_common
Change-Id: Idc41b2a509f43dbe946b2e26f2afd775726514aa
Ugo Yu [Fri, 21 Sep 2018 22:59:45 +0000 (15:59 -0700)]
[automerger skipped] [automerger] DO NOT MERGE - Check SDU lower bound before allocate p_data am:
87bcda81b8 am:
8e31e9abb4 am:
e51a7b9760 am:
90248f8fb3 skipped:
b3bef4683a am:
c5baf9ac24 am:
9bcb338d3d am:
247c18200e -s ours am:
98b1791a40
am:
494c0e3e9b -s ours
Change-Id: Iada61fafca359fd7081c8e9e5fbe602a4c773760
Ugo Yu [Fri, 21 Sep 2018 21:06:13 +0000 (14:06 -0700)]
[automerger skipped] [automerger] DO NOT MERGE - Check SDU lower bound before allocate p_data am:
87bcda81b8 am:
8e31e9abb4 am:
e51a7b9760 am:
90248f8fb3 skipped:
b3bef4683a am:
c5baf9ac24 am:
9bcb338d3d am:
247c18200e -s ours
am:
98b1791a40
Change-Id: I1b0fddfdf511c4e106791c139ddfb1a8caed1d76
Ugo Yu [Fri, 21 Sep 2018 21:00:46 +0000 (14:00 -0700)]
[automerger skipped] [automerger] DO NOT MERGE - Check SDU lower bound before allocate p_data am:
87bcda81b8 am:
8e31e9abb4 am:
e51a7b9760 am:
90248f8fb3 skipped:
b3bef4683a am:
c5baf9ac24 am:
9bcb338d3d
am:
247c18200e -s ours
Change-Id: I55bc0845e682b7cf381bcd68e471c34e839bea2e
Ugo Yu [Fri, 21 Sep 2018 20:54:48 +0000 (13:54 -0700)]
[automerger] DO NOT MERGE - Check SDU lower bound before allocate p_data am:
87bcda81b8 am:
8e31e9abb4 am:
e51a7b9760 am:
90248f8fb3 skipped:
b3bef4683a am:
c5baf9ac24
am:
9bcb338d3d
Change-Id: I99df5a715a420c7b797996b7235277cb8901585a
Ugo Yu [Fri, 21 Sep 2018 20:47:18 +0000 (13:47 -0700)]
[automerger] DO NOT MERGE - Check SDU lower bound before allocate p_data am:
87bcda81b8 am:
8e31e9abb4 am:
e51a7b9760 am:
90248f8fb3 skipped:
b3bef4683a
am:
c5baf9ac24
Change-Id: Ifc64ce2a02192aa306e8716ce24098abc1d75b42
Ugo Yu [Mon, 17 Sep 2018 07:59:30 +0000 (15:59 +0800)]
DO NOT MERGE - Check SDU lower bound before allocate p_data
Bug:
112321180
Test: SL4A BleCocTest:test_coc_insecured_connection_write_ascii
Change-Id: Id0c9aa2097f0b6bdc2bb9fa9086daa9452188e1d
Merged-In: Id0c9aa2097f0b6bdc2bb9fa9086daa9452188e1d
Ugo Yu [Mon, 17 Sep 2018 07:59:30 +0000 (15:59 +0800)]
DO NOT MERGE - Check SDU lower bound before allocate p_data
Bug:
112321180
Test: SL4A BleCocTest:test_coc_insecured_connection_write_ascii
Change-Id: Id0c9aa2097f0b6bdc2bb9fa9086daa9452188e1d
Dan Shi [Wed, 19 Sep 2018 01:22:37 +0000 (18:22 -0700)]
Merge "Add net_test_avrcp to general-tests suite" am:
425bca9026 am:
bfbcafd3ed
am:
510999e3f3
Change-Id: I5e155e296b9d902febb88535fc592d4c45f72388