OSDN Git Service
Jakub Pawlowski [Mon, 8 Oct 2018 23:18:11 +0000 (16:18 -0700)]
Merge "Fix race condition around Le Start Encryption handling." am:
f67a4f54b3
am:
c6c8c6e561
Change-Id: Ic4be975e54ff87651b37b1ba4147bc1299f9e532
Jakub Pawlowski [Mon, 8 Oct 2018 23:09:40 +0000 (16:09 -0700)]
Merge "Fix race condition around Le Start Encryption handling."
am:
f67a4f54b3
Change-Id: Ic343e34c18dd0ce8ef0fdbf8a23037e3bcb24878
Treehugger Robot [Mon, 8 Oct 2018 22:17:28 +0000 (22:17 +0000)]
Merge "Fix race condition around Le Start Encryption handling."
Jakub Pawlowski [Mon, 1 Oct 2018 11:25:11 +0000 (13:25 +0200)]
Fix race condition around Le Start Encryption handling.
When sending Le Start Encryption, it's possible that at the same exact
moment the connection was disconnected, and there is an incoming
"Disconnection Complete Event". The controller would send error 0x02
"unknown connection identifier" in such case. This can happen
sporadically when reconnecting device multiple times.
Currently, we don't handle this error code. This lead to the timeout
when waiting for "Encryption Complete", and unbonding of the device.
From now on, if 0x02 error code is returned, we'll cancel current SMP
operation, which is the "LE Start Encryption". This will stop the SMP
timer, and make sure the bond to remote device is not lost.
Test: Manual test reconnecting with HID device multiple time in a row,
causing the link drop right after connection, by removing battery, or
closing the shield box.
Bug:
113652889
Change-Id: I2ff9c13dbc8e7b71505908996e26b89fa1ea6a42
weichinweng [Mon, 8 Oct 2018 11:26:43 +0000 (04:26 -0700)]
Merge "Stop A2DP stream when shutting down A2DP source." am:
90942c06f2
am:
30eed705e5
Change-Id: Ia92bd09915113b91fdb91b967b86b82ad80e29cd
weichinweng [Mon, 8 Oct 2018 11:18:40 +0000 (04:18 -0700)]
Merge "Stop A2DP stream when shutting down A2DP source."
am:
90942c06f2
Change-Id: If18e665cdda1e69aca48cd31bc1a44d5c4d3a237
Treehugger Robot [Mon, 8 Oct 2018 11:06:32 +0000 (11:06 +0000)]
Merge "Stop A2DP stream when shutting down A2DP source."
Hansong Zhang [Fri, 5 Oct 2018 18:42:06 +0000 (11:42 -0700)]
Merge "HIDD: Check descriptor length and increase buffer" into pi-dev
am:
9499309599
Change-Id: Idbf1f9a6064b68a0579f985aecb08a5945b9086b
TreeHugger Robot [Fri, 5 Oct 2018 18:02:40 +0000 (18:02 +0000)]
Merge "HIDD: Check descriptor length and increase buffer" into pi-dev
weichinweng [Wed, 3 Oct 2018 07:08:54 +0000 (15:08 +0800)]
Stop A2DP stream when shutting down A2DP source.
When shutting down a2dp source,
A2DP source set StateShuttingDown state too fast cause the A2DP doesn’t stop stream.
Will try to stop A2DP when doing A2DP source end session.
Bug:
112279820
Test: Build Pass, BT off/on when play A2DP
Change-Id: I6bfb5c235da1ff4a7e6814bae3a98ae7dd1788aa
Hansong Zhang [Thu, 4 Oct 2018 06:30:33 +0000 (23:30 -0700)]
Merge "MessageLoopThread: Release lock during blocked StartUp/ShutDown" am:
9a6d430622
am:
a9ddafe66f
Change-Id: If8d3cc3a0445176fba6e1cd0d99d491ea9889726
Hansong Zhang [Thu, 4 Oct 2018 06:23:11 +0000 (23:23 -0700)]
Merge "MessageLoopThread: Release lock during blocked StartUp/ShutDown"
am:
9a6d430622
Change-Id: I8edb2ee00ed78e5f27d91dc23e4cd6a8563c6bc8
Treehugger Robot [Thu, 4 Oct 2018 06:10:47 +0000 (06:10 +0000)]
Merge "MessageLoopThread: Release lock during blocked StartUp/ShutDown"
Hansong Zhang [Tue, 2 Oct 2018 23:26:38 +0000 (16:26 -0700)]
HIDD: Check descriptor length and increase buffer
Since maximum descriptor length is 2048, we need to assign 2054 bytes of
buffer for another 6 bytes of data. Also added a const for maximum
descriptor length.
Bug:
113572366
Test: manual
Change-Id: Ie2b25c9e1a9f2019cbc7e6fbecbb08b643c87946
Merged-In: Ie2b25c9e1a9f2019cbc7e6fbecbb08b643c87946
Hansong Zhang [Wed, 3 Oct 2018 23:08:39 +0000 (16:08 -0700)]
Timer: Set data member before scheduling task am:
1773dd8d82
am:
04d345f0a5
Change-Id: Idc1c6806f74ddf5412c278707404b643f07a7f01
Hansong Zhang [Sat, 29 Sep 2018 21:23:31 +0000 (14:23 -0700)]
MessageLoopThread: Release lock during blocked StartUp/ShutDown
During StartUp/ShutDown(), if another running task in message loop needs
api_lock, then it will deadlock. Release api_lock in StartUp and
ShutDown when current thread is blocked by another task
Bug:
116081383
Test: run unit test
Change-Id: Ic34406d0cfc6364ac965c4f1aa917a5ccaf6b373
Hansong Zhang [Wed, 3 Oct 2018 23:01:34 +0000 (16:01 -0700)]
Timer: Set data member before scheduling task
am:
1773dd8d82
Change-Id: I6c6c82ec7a58e429778116d064cc1ac4d825fd6b
Pavlin Radoslavov [Wed, 3 Oct 2018 21:59:21 +0000 (14:59 -0700)]
Run the wakelock JNI callbacks on the JNI thread
am:
f918ab9ff8
Change-Id: I995d08242e3899e8ae42a4f0a9fe68f84ffda610
Hansong Zhang [Fri, 28 Sep 2018 19:10:15 +0000 (12:10 -0700)]
Timer: Set data member before scheduling task
Also increase tolerance for unit tests
Bug:
116081383
Test: Run unit test
Change-Id: I5531c2259cbbc58b6ee7527813e8d5c4164e94c5
Pavlin Radoslavov [Sat, 25 Aug 2018 01:45:16 +0000 (18:45 -0700)]
Run the wakelock JNI callbacks on the JNI thread
All JNI callbacks must be on the JNI thread, otherwise this could
impact the threads' operation.
Bug:
111277984
Test: A2DP streaming
Change-Id: I94fa4500aea62a574c80749e904434e46eb4e942
(cherry picked from commit
c788ad703836f6ac0f63e47b20f27b41dcce9353)
Stanley Tng [Tue, 2 Oct 2018 20:09:10 +0000 (13:09 -0700)]
Hearing Aid: use correct Data Length and MediaType am:
51a9bba709
am:
530a90b15d
Change-Id: I37e35cf75577a7e07ce9745bea237095a62da304
Stanley Tng [Tue, 2 Oct 2018 19:45:20 +0000 (12:45 -0700)]
Hearing Aid: use correct Data Length and MediaType
am:
51a9bba709
Change-Id: I1be9f73bec94680634e7022ca023a5b9f9219a87
Andrew Lewis [Tue, 2 Oct 2018 12:01:24 +0000 (12:01 +0000)]
Revert "DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist"
This reverts commit
d65f697c011cc6e5eaad767de3ec726cfd25b27f.
Reason for revert: broken pi-dev-plus-aosp
Change-Id: Iab11567fa326b6837a621c1edc93e0eceb04ec43
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
Stanley Tng [Tue, 25 Sep 2018 18:15:24 +0000 (11:15 -0700)]
Hearing Aid: use correct Data Length and MediaType
Adjusted the requested data length to the BT Controller from 168 to 167.
Also, change the default media type during playback to unknown.
Test: Manual testing with Hearing Aids and verifying with OTA logs
Change-Id: Ic4e934729a98bef5c10ebca64093d8a192e79a01
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 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: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: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: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: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: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:51:42 +0000 (21:51 -0700)]
Merge "Add noexcept to move constructors and assignment operators." am:
2e3fa05261
am:
6901c69166
Change-Id: I8a77d6538f8e41e5a81358548d92b02e0544f3a8
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: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: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: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 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
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: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 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: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 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
OSDN Git Service
