OSDN Git Service
Joseph Pirozzo [Thu, 2 May 2019 23:45:03 +0000 (16:45 -0700)]
Handling of incoming AVRCP Controller connections
Resolve edge cases on incoming AVRCP Controllers Remote Controller
cases, both caused the remote control component to either generate an
out of bounds error or fail to update peer features.
Test: receive incoming AVRCP connection
Bug:
130750865
Change-Id: I15abd2fd4bc963889d6cdfe9364a651e2b4c3c10
Merged-In: I15abd2fd4bc963889d6cdfe9364a651e2b4c3c10
Weichin Weng [Sat, 4 May 2019 00:29:51 +0000 (00:29 +0000)]
Merge "Don't read HearingAid properties if already have properties value." into qt-dev
Ted Wang [Fri, 3 May 2019 05:53:51 +0000 (05:53 +0000)]
Merge "Fix potential OOB read in sdpu_get_len_from_type" into qt-dev
weichinweng [Thu, 2 May 2019 07:31:33 +0000 (15:31 +0800)]
Don't read HearingAid properties if already have properties value.
When read HearingAid properties, don't read it if already have the
HearingAid properties in config file. Will use these values in config
file since these values should never change.
Bug:
128464408
Test: 1.Forget/Repair HearingAid device from Bluetooth UI.
2.Disconnect/Reconnect HearingAid device from Bluetooth UI.
3.HearingAid device power off/on, check them can reconnect.
Change-Id: Id4c30947c75f0615514075ec36c50afb58fc3f14
Merged-In: Id4c30947c75f0615514075ec36c50afb58fc3f14
Myles Watson [Fri, 22 Mar 2019 23:51:39 +0000 (16:51 -0700)]
GATT: Use a list for services in a GATT database
Iterators to list elements are not invalidated by the addition and
removal of other elements.
Bug:
128938477
Test: net_test_bta
Change-Id: I45d74a63fc6b55ece3a4af02e0cc3e1de757cc4d
Ted Wang [Mon, 29 Apr 2019 02:11:04 +0000 (10:11 +0800)]
Fix potential OOB read in sdpu_get_len_from_type
Add boundary check in sdpu_get_len_from_type to prevent potential OOB read.
Bug:
117105007
Test: Manul
Change-Id: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
Jakub Pawlowski [Wed, 24 Apr 2019 21:00:16 +0000 (23:00 +0200)]
Add workaround for "Service Changed" indications breaking server-only remotes
Test: Connect with ruwido remote when magictether service is registered
Bug:
122994857
(cherry picked from commit
fb252b47ca9478c3678532d04e777fd6f848132a)
Merged-In: Ibb2c1272bb08c7a127c8f7d37ee6a05f15618fc2
Change-Id: Ibb2c1272bb08c7a127c8f7d37ee6a05f15618fc2
TreeHugger Robot [Mon, 29 Apr 2019 23:36:29 +0000 (23:36 +0000)]
Merge "Add a persistent key to overwrite MIN_CE_LEN for Hearing Aids" into qt-dev
Stanley Tng [Sat, 27 Apr 2019 21:51:11 +0000 (14:51 -0700)]
Add a persistent key to overwrite MIN_CE_LEN for Hearing Aids
To help in debugging the noise issues on Hearing Aids, add a new
persistent key, persist.bluetooth.hearingaidmincelen, to overwrite the
MIN_CE_LEN parameter that are used for the Connection Parameter Update
operations.
Bug:
130916579
Test: Manual testing
Change-Id: I1c52b2f99235f8d88e0a1d278dbf3174f1c60709
(cherry picked from commit
4900661c4904fb28ab6b1fca591e510b7782fe5f)
Merged-In: I1c52b2f99235f8d88e0a1d278dbf3174f1c60709
Martin Brabham [Mon, 22 Apr 2019 16:33:25 +0000 (09:33 -0700)]
Revert "Revert "DO NOT MERGE: osi: Offload mutex pointer to local scope""
This reverts commit
f964b3c6817d0a400886bd103e5294bb929b7c3b.
Bug:
117997080
Test: atest net_test_bluetooth
TreeHugger Robot [Thu, 25 Apr 2019 05:36:05 +0000 (05:36 +0000)]
Merge "Call gatt_disconnect if the LE connection is not established and no APP use it." into qt-dev
weichinweng [Tue, 23 Apr 2019 02:56:20 +0000 (10:56 +0800)]
HearingAid: add addToWhiteList NativeInterface API
Add a new native interface API, addToWhiteList, that adds a LE device to
the whitelist.
Bug:
129452236
Test: Manual testing with Hearing Aids
Change-Id: I57c327380f07243e484c5c3afedfe60404f883fa
Merged-In: I57c327380f07243e484c5c3afedfe60404f883fa
Jakub Pawlowski [Mon, 11 Mar 2019 18:22:01 +0000 (19:22 +0100)]
DO NOT MERGE Don't persist bonds using sample LTK
Test: compilation, manual testing
Bug:
128437297
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111
TreeHugger Robot [Tue, 23 Apr 2019 01:24:26 +0000 (01:24 +0000)]
Merge "HFP: Fix null pointer dereference in bta_ag_codec_negotiate()." into qt-dev
Weichin Weng [Tue, 23 Apr 2019 00:24:21 +0000 (00:24 +0000)]
Merge "Use GATT_WRITE_NO_RSP for "state change" updates" into qt-dev
weichinweng [Mon, 25 Mar 2019 05:51:10 +0000 (13:51 +0800)]
Call gatt_disconnect if the LE connection is not established and no APP use it.
When the LE connection hold APP is removed, if the LE connection is not
established and no APP use it, we never free transport control block
(p_tcb) or close it. For BLE device that have not established and no APP
use it, will call gatt_disconnect to free p_tcb and go to close state.
Bug:
127908699
Test: GattConnectTest
Change-Id: Ifed10c67141cb4c9221478db759c5614714fff30
Merged-In: Ifed10c67141cb4c9221478db759c5614714fff30
Jack He [Sun, 21 Apr 2019 00:01:53 +0000 (17:01 -0700)]
TEST: Fix net_test_stock_rfcomm unit test
* Properly mock updated L2CAP registeration method by including the
filtered btsnoop option
* Properly mock btsnoop module by creating a separate file to link with
the test executable
Fixes:
123361801
Test: atest net_test_stack_rfcomm
Change-Id: I89ca875cbcc941feddd7c501fa1b7e14f8d14794
Ray Kuo [Tue, 16 Apr 2019 13:36:23 +0000 (21:36 +0800)]
HFP: Fix null pointer dereference in bta_ag_codec_negotiate().
BTM_ReadRemoteFeatures function will return NULL if ACL link to the remote
device is disconnected. Need to check whether p_rem_feat is nullptr
before dereferencing it.
Bug:
129736080
Test: make, force BTM_ReadRemoteFeatures() to return null and perform
MT/MO call tests.
Change-Id: I28d90823340d8721ee2349d3f55f07d1e823fee3
Merged-In: I28d90823340d8721ee2349d3f55f07d1e823fee3
TreeHugger Robot [Fri, 19 Apr 2019 03:46:23 +0000 (03:46 +0000)]
Merge "btif: Short circuit NIAP key attestation check" into qt-dev
Zach Johnson [Fri, 19 Apr 2019 02:01:29 +0000 (02:01 +0000)]
Merge "Revert "DO NOT MERGE: osi: Offload mutex pointer to local scope"" into qt-dev
Zach Johnson [Fri, 19 Apr 2019 01:59:54 +0000 (01:59 +0000)]
Revert "DO NOT MERGE: osi: Offload mutex pointer to local scope"
This reverts commit
15529d316435ae977d3d578faa382bc1af89e787.
Reason for revert: causes crash at ToT
Bug:
130840078
Change-Id: Iee8a968afe385fff35f9db4e3a628f0592ee9a5b
weichinweng [Wed, 17 Apr 2019 07:52:07 +0000 (15:52 +0800)]
Use GATT_WRITE_NO_RSP for "state change" updates
For Hearing Aid, replaces the GATT_WRITE with GATT_WRITE_NO_RSP for the
"state change" updates that are send to the devices. Using no response
write is faster and these informational updates does not need a
confirmation from the devices.
Bug:
130332748
Test: 1.run unit test
2.Forget/Repair HearingAid device from Bluetooth UI.
3.Disconnect/Reconnect HearingAid device from Bluetooth UI.
4.HearingAid device power off/on, check them can reconnect.
5.Multiple click connect/disconnect from Bluetooth UI within 1 sec,
check them can reconnect.
6.One side HearingAid device power off/on when playing music, check it
can reconnect and music is work fine.
Change-Id: I55e9b4b0b8c76412e5810e1cec5d96819527d099
Merged-In: I55e9b4b0b8c76412e5810e1cec5d96819527d099
Martin Brabham [Mon, 15 Apr 2019 21:14:54 +0000 (14:14 -0700)]
btif: Short circuit NIAP key attestation check
Ensure the check always passes so bluetooth is stable.
There is a vendor code issue with keymaster having random HAL errors (-1).
Revert this change after the keystore issues are resolved.
b/
130045583
b/
130163310
Bug:
129759834
Test: atest net_test_btif
Change-Id: I65c13eb4638799ca73bc2d3d8d07cdf14a8624c7
TreeHugger Robot [Thu, 18 Apr 2019 21:15:08 +0000 (21:15 +0000)]
Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into qt-dev
Martin Brabham [Thu, 4 Apr 2019 21:57:41 +0000 (14:57 -0700)]
DO NOT MERGE: osi: Offload mutex pointer to local scope
Create a shared_ptr for the callback_mutex in the alarm struct.
When performing the callback, make a local shared_ptr reference.
lock_guard on the local shared_ptr reference.
Bug:
117997080
Test: atest net_test_bluetooth
Change-Id: Iab800f720f4ccc4735e4d494e0d458eb97b40a4a
Jakub Pawlowski [Mon, 15 Apr 2019 20:07:27 +0000 (22:07 +0200)]
Send connected callback immediately when attempting to connect to already connected device
Instead of adding the device to the connection manager, just send the
successfull connection callback.
This patch is restoring behaviour from before Connection Manager
refactor. During the refactor this behaviour was broken.
Bug:
130273570
Test: sl4a GattConnectTest
Change-Id: Ic4fa7089a8262f6f792206496a7cfb9c83a16eb2
Merged-In: Ic4fa7089a8262f6f792206496a7cfb9c83a16eb2
Myles Watson [Fri, 12 Apr 2019 21:30:51 +0000 (14:30 -0700)]
RootCanal: Open network ports only if there is a console
Fixes:
128355308
Test: toggle airplane mode and check for opening sockets
Change-Id: I8c4581b708c05a8c72dba3604c02adea97c1653b
TreeHugger Robot [Thu, 11 Apr 2019 03:37:58 +0000 (03:37 +0000)]
Merge "Change storage metadata type to byte array" into qt-dev
Jakub Pawlowski [Mon, 8 Apr 2019 13:07:10 +0000 (06:07 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK am:
292fcf8612 -s ours am:
e8dea68f6a -s ours am:
dc17388efd -s ours
am:
6c931823ce -s ours
am skip reason: subject contains skip directive
Change-Id: I5594c2a292a9754900e8c574cc859f51dbc4442c
Jakub Pawlowski [Mon, 8 Apr 2019 13:03:09 +0000 (06:03 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK am:
292fcf8612 -s ours am:
e8dea68f6a -s ours
am:
dc17388efd -s ours
am skip reason: subject contains skip directive
Change-Id: I368bf6dcf1599b50fce99a9c55fb25bc896996cb
Jakub Pawlowski [Mon, 8 Apr 2019 13:00:22 +0000 (06:00 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK am:
292fcf8612 -s ours
am:
e8dea68f6a -s ours
am skip reason: change_id I52fd484d42bf87e96dbc9e6456090f231ed48111 with SHA1
c0fb2a25f9 is in history
Change-Id: If68cf83db0a7388146f4e28a8433f8bd4c402e72
Jakub Pawlowski [Mon, 8 Apr 2019 12:55:18 +0000 (05:55 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK
am:
292fcf8612 -s ours
am skip reason: change_id I52fd484d42bf87e96dbc9e6456090f231ed48111 with SHA1
c0fb2a25f9 is in history
Change-Id: I923523630e1e8530f23f3720611582353ffecff4
Jakub Pawlowski [Mon, 11 Mar 2019 18:22:01 +0000 (19:22 +0100)]
DO NOT MERGE Don't persist bonds using sample LTK
Test: compilation, manual testing
Bug:
128843052
Merged-In: I52fd484d42bf87e96dbc9e6456090f231ed48111
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111
Ugo Yu [Thu, 14 Mar 2019 07:32:44 +0000 (15:32 +0800)]
Change storage metadata type to byte array
Bug:
124448651
Test: runtest bluetooth
Change-Id: I10489c4aa93c2c3463456bcba210036bc20082a4
Jakub Pawlowski [Sat, 6 Apr 2019 00:30:22 +0000 (17:30 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e skipped:
05e4e07328 am:
c07f304de8 am:
fc58eb3c8d am:
97e9e1540a -s ours
am:
a07ff2d7de -s ours
am skip reason: subject contains skip directive
Change-Id: I2b7882f5c6ac4790c9f32be9640743ee2471e6d4
Jakub Pawlowski [Sat, 6 Apr 2019 00:29:33 +0000 (17:29 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK am:
054dcec1c9 -s ours
am:
1091324048 -s ours
am skip reason: subject contains skip directive
Change-Id: I3143af4a96421e245ea8fbe6ba3f887f1740603e
Jakub Pawlowski [Fri, 5 Apr 2019 23:25:51 +0000 (16:25 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e skipped:
05e4e07328 am:
c07f304de8 am:
fc58eb3c8d
am:
97e9e1540a -s ours
am skip reason: subject contains skip directive
Change-Id: Ib1c23383e61d4faca8970cad71fa8f24dd2e354c
Jakub Pawlowski [Fri, 5 Apr 2019 23:23:05 +0000 (16:23 -0700)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e skipped:
05e4e07328 am:
c07f304de8
am:
fc58eb3c8d
Change-Id: I346917706000054f0aee3bc3084f60e15b7a4f57
Jakub Pawlowski [Fri, 5 Apr 2019 23:03:40 +0000 (16:03 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK
am:
054dcec1c9 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib7be32bd6046f7fce608fc0bef9d812ab6341b2a
Jakub Pawlowski [Fri, 5 Apr 2019 21:27:01 +0000 (14:27 -0700)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e skipped:
05e4e07328
am:
c07f304de8
Change-Id: I20eed1aeb29a3df15251033d02fd7d5d241a28dd
Jakub Pawlowski [Fri, 5 Apr 2019 21:15:47 +0000 (14:15 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK
am:
250529d6f1 -s ours
am skip reason: subject contains skip directive
Change-Id: I0a7b5b8ff742ca1b31b35247da5b3ea3eb97ab19
Jakub Pawlowski [Tue, 2 Apr 2019 17:21:14 +0000 (19:21 +0200)]
Fix for GATT not returning disconnect callback.
Before recent refactor GATT was using the L2CAP layer to start LE
connections. Since the refactor, GATT talks directly to added
connection_manager, just like L2CAP.
L2CAP does have it's own timer for direct connections, that was
returning conneciton failure after timeout. After switching to
connection_manager, GATT no longer receives those callbacks.
This patch makes the connection_manager send the on_connection_timed_out
callback, and wire it to same handler that L2CAP layer was using before.
Test: unit tests added
Bug:
125553095
Change-Id: Iaf8be46fe8eed49f78ddbc6a2f3516bc8279e91f
Ugo Yu [Wed, 3 Apr 2019 21:11:16 +0000 (14:11 -0700)]
Merge "Handle Bluetooth HAL service died" am:
fcaed46d9e am:
5e3e0bba7c
am:
f8d4bb86d7
Change-Id: I5fd483628665f5f795e3c712943c6c62e4142e4d
TreeHugger Robot [Wed, 3 Apr 2019 19:49:20 +0000 (19:49 +0000)]
Merge "Check GATT notification len"
Ugo Yu [Wed, 3 Apr 2019 19:07:14 +0000 (12:07 -0700)]
Merge "Handle Bluetooth HAL service died" am:
fcaed46d9e
am:
5e3e0bba7c
Change-Id: I55c92c433d7f80e4a0cb21321480d0e7178d64d8
Ugo Yu [Wed, 3 Apr 2019 18:57:43 +0000 (11:57 -0700)]
Merge "Handle Bluetooth HAL service died"
am:
fcaed46d9e
Change-Id: I105aad49177d7987fd0ad97fdad9d22359fd32d6
Treehugger Robot [Wed, 3 Apr 2019 18:45:12 +0000 (18:45 +0000)]
Merge "Handle Bluetooth HAL service died"
Ugo Yu [Tue, 2 Apr 2019 13:55:14 +0000 (21:55 +0800)]
Handle Bluetooth HAL service died
Bug:
129320921
Test: kill Bluetooth HAL
Change-Id: I83c897f5a9def52b2050a3e73d97f99b1b71aa3b
TreeHugger Robot [Wed, 3 Apr 2019 12:56:11 +0000 (12:56 +0000)]
Merge "Fix handling of startup_timer_expired"
Sunny Kapdi [Sat, 30 Mar 2019 00:42:38 +0000 (17:42 -0700)]
Fix handling of startup_timer_expired
1. The startup_timer needs to be less than
3 sec to allow the wakelock to be held by
the stack and needs to be less than the
BLE_START_TIMEOUT of framework.
2. On expiry of startup_timer, just abort
as there is no proper recovery steps here.
Bug:
129394377
Change-Id: I1a397bab5c88fe7ef8ccbc369897903ee5d0a36a
Myles Watson [Wed, 3 Apr 2019 05:16:40 +0000 (22:16 -0700)]
Merge "RootCanal: Add beacons by default" am:
ca152a6705 am:
f0aeea3cd3
am:
d22e75eae1
Change-Id: I679da68b02f40560efec19ffdaf8f81454a76651
Myles Watson [Wed, 3 Apr 2019 04:22:13 +0000 (21:22 -0700)]
Merge "RootCanal: Add beacons by default" am:
ca152a6705
am:
f0aeea3cd3
Change-Id: I13b3fdf29ad8002f506ce317230a9cfc671a4fce
Myles Watson [Wed, 3 Apr 2019 03:52:15 +0000 (20:52 -0700)]
Merge "RootCanal: Add beacons by default"
am:
ca152a6705
Change-Id: I5dc0e3cceb7ae1cb4e4a4cb4d5e31c52a6ee6343
Treehugger Robot [Wed, 3 Apr 2019 03:40:38 +0000 (03:40 +0000)]
Merge "RootCanal: Add beacons by default"
Android Build Merger (Role) [Wed, 3 Apr 2019 02:51:38 +0000 (02:51 +0000)]
Merge "Merge "packet: Add Packet classes and tests" am:
a275910a49 am:
257ed53ca9 am:
995361568d"
Myles Watson [Wed, 3 Apr 2019 02:51:27 +0000 (19:51 -0700)]
Merge "packet: Add Packet classes and tests" am:
a275910a49 am:
257ed53ca9
am:
995361568d
Change-Id: I9f2f7b7b8bc14b80f7306ad2eb6cc5907d39c440
Myles Watson [Wed, 3 Apr 2019 02:51:19 +0000 (19:51 -0700)]
Merge "packet: Add Packet classes and tests" am:
a275910a49 am:
257ed53ca9
am:
995361568d
Change-Id: Iad797e8182c3c824cf483249ca5f09be06d7b9c9
Android Build Merger (Role) [Wed, 3 Apr 2019 02:44:21 +0000 (02:44 +0000)]
Merge "Add service change handle for Hearing Aids am:
c410c2e7f1 am:
003b2e01fc am:
d66e625934"
weichinweng [Wed, 3 Apr 2019 02:44:10 +0000 (19:44 -0700)]
Add service change handle for Hearing Aids am:
c410c2e7f1 am:
003b2e01fc
am:
d66e625934
Change-Id: I9fccba58581984864331051972bc3227b031a953
weichinweng [Wed, 3 Apr 2019 02:43:45 +0000 (19:43 -0700)]
Add service change handle for Hearing Aids am:
c410c2e7f1 am:
003b2e01fc
am:
d66e625934
Change-Id: I2fb8650abfdeb14a5df075ed1bd822897f24dc72
Myles Watson [Wed, 3 Apr 2019 02:08:37 +0000 (19:08 -0700)]
Merge "packet: Add Packet classes and tests" am:
a275910a49
am:
257ed53ca9
Change-Id: I42f2095652377e9ac744b6ae31723ce34d78be1a
weichinweng [Wed, 3 Apr 2019 02:06:01 +0000 (19:06 -0700)]
Add service change handle for Hearing Aids am:
c410c2e7f1
am:
003b2e01fc
Change-Id: I68a3874f4bb68eb0019da29934e5966fedcb52c0
Myles Watson [Wed, 3 Apr 2019 01:37:51 +0000 (18:37 -0700)]
Merge "packet: Add Packet classes and tests"
am:
a275910a49
Change-Id: I930470fa3921157afe771cab7f427168c89f6a95
weichinweng [Wed, 3 Apr 2019 01:36:31 +0000 (18:36 -0700)]
Add service change handle for Hearing Aids
am:
c410c2e7f1
Change-Id: I77c2bec2821d939fe8323d64ab051260bf9d57ee
Treehugger Robot [Wed, 3 Apr 2019 01:01:06 +0000 (01:01 +0000)]
Merge "packet: Add Packet classes and tests"
Jakub Pawlowski [Tue, 2 Apr 2019 22:39:28 +0000 (15:39 -0700)]
Fix for GATT not returning disconnect callback. am:
8edcc90e45 am:
5530bf16c2
am:
cb474ec98d
Change-Id: Ia30985ef1ce0a0b55b617b1ea9a116411e4bec74
Jack He [Tue, 2 Apr 2019 22:38:08 +0000 (15:38 -0700)]
Merge "Common: remove GD related stuff from common" am:
98695adc1c am:
a946a72a12
am:
ea973a4cb5
Change-Id: I8b365c79176e0c09e83dd2345ec199e49c61a327
Myles Watson [Mon, 1 Apr 2019 20:21:25 +0000 (13:21 -0700)]
packet: Add Packet classes and tests
Test: atest bluetooth_test_gd
Change-Id: I8e124d5123cff3354f5c451b3806904a2d60b38d
weichinweng [Wed, 20 Mar 2019 10:53:11 +0000 (18:53 +0800)]
Add service change handle for Hearing Aids
When receive service changed indication from Hearing Aid (which indicates
Hearing Aid service changed), it will refresh the hearing aid attribute
handle to ensure the attribute handle is correct.
Bug:
122008481
Test: 1.run unit test
2.After Pair old version FW HearingAid, Disconnect/Reconnect new version
FW HearingAId, then check whether HearingAid is working fine.
3.After Pair old version FW HearingAid, Bluetooth off/on to reconnect
new version FW HearingAId, then check whether HearingAid is working
fine.
Change-Id: I48eae10a3016429f35f4f904752be93bb419d515
Jakub Pawlowski [Tue, 2 Apr 2019 21:57:32 +0000 (14:57 -0700)]
Fix for GATT not returning disconnect callback. am:
8edcc90e45
am:
5530bf16c2
Change-Id: I021a4efbc9aa82cee53f710236f4ff273f744626
Jack He [Tue, 2 Apr 2019 21:56:28 +0000 (14:56 -0700)]
Merge "Common: remove GD related stuff from common" am:
98695adc1c
am:
a946a72a12
Change-Id: I29ece637f8b9e2baa9a9e04270655dd0e3c91de0
TreeHugger Robot [Tue, 2 Apr 2019 21:34:08 +0000 (21:34 +0000)]
Merge "Check HCI_ACL header length"
Jakub Pawlowski [Tue, 2 Apr 2019 21:22:59 +0000 (14:22 -0700)]
Fix for GATT not returning disconnect callback.
am:
8edcc90e45
Change-Id: Ib0e1bf8b76c163eafbd909d81f0137dc9a247d25
Jakub Pawlowski [Tue, 2 Apr 2019 17:21:14 +0000 (19:21 +0200)]
Fix for GATT not returning disconnect callback.
Before recent refactor GATT was using the L2CAP layer to start LE
connections. Since the refactor, GATT talks directly to added
connection_manager, just like L2CAP.
L2CAP does have it's own timer for direct connections, that was
returning conneciton failure after timeout. After switching to
connection_manager, GATT no longer receives those callbacks.
This patch makes the connection_manager send the on_connection_timed_out
callback, and wire it to same handler that L2CAP layer was using before.
Test: unit tests added
Bug:
125553095
Change-Id: Iaf8be46fe8eed49f78ddbc6a2f3516bc8279e91f
Myles Watson [Tue, 2 Apr 2019 20:57:46 +0000 (13:57 -0700)]
RootCanal: Add beacons by default
Bug:
129546852
Test: Scan for devices using RootCanal as the Bluetooth chip
Change-Id: Ia17535bffbcdde28db5120f99aad45a915f1a7ca
Jack He [Tue, 2 Apr 2019 20:57:49 +0000 (13:57 -0700)]
Merge "Common: remove GD related stuff from common"
am:
98695adc1c
Change-Id: I13d8f4c471ad366b52740f2d39faf78600e9f9a1
Treehugger Robot [Tue, 2 Apr 2019 20:07:54 +0000 (20:07 +0000)]
Merge "Common: remove GD related stuff from common"
Jack He [Mon, 1 Apr 2019 23:20:14 +0000 (16:20 -0700)]
Common: remove GD related stuff from common
* Remove reactor, thread, handler, alarm, repeating alarm from common/
since they are already copied into gd/os
* Extract thread and alarm benchmarks into gd:bluetooth_benchmark_gd
* Enable host side unit tests for system/bt in TEST_MAPPING
Bug:
129537494
Test: run benchmark, run unit tests
Change-Id: Id5d7592067bab3275976dfc710e4d751c43b9df8
Greg Kaiser [Tue, 2 Apr 2019 18:08:05 +0000 (11:08 -0700)]
Avoid using erase()d iterator am:
120f377694 am:
d91ef79ae7
am:
abd9d89f40
Change-Id: I42cb18d11c30a061f16ee13c781b21fc86956a32
Greg Kaiser [Tue, 2 Apr 2019 18:07:43 +0000 (11:07 -0700)]
btif_storage: Avoid extra std::string copies am:
709a29f9e9 am:
f6dc9ad977
am:
cc87e84c65
Change-Id: Ic5d4f9e69d2f4b2fa3b0a849b655a5f345c9818e
Greg Kaiser [Tue, 2 Apr 2019 17:35:52 +0000 (10:35 -0700)]
Avoid using erase()d iterator am:
120f377694
am:
d91ef79ae7
Change-Id: I695790afdba58fc51cb12370b2632ece77d4b436
Greg Kaiser [Tue, 2 Apr 2019 17:35:23 +0000 (10:35 -0700)]
btif_storage: Avoid extra std::string copies am:
709a29f9e9
am:
f6dc9ad977
Change-Id: I1acf598e920d70da086aa20dcbd95cc2fa485f49
Greg Kaiser [Tue, 2 Apr 2019 17:02:47 +0000 (10:02 -0700)]
Avoid using erase()d iterator
am:
120f377694
Change-Id: I5039b59eae6da98daa35581a51ed9112d9cb1d73
Greg Kaiser [Tue, 2 Apr 2019 17:02:34 +0000 (10:02 -0700)]
btif_storage: Avoid extra std::string copies
am:
709a29f9e9
Change-Id: I5867967366a9e17af8529153d7ea37f7bd78e72d
Greg Kaiser [Mon, 1 Apr 2019 13:47:23 +0000 (06:47 -0700)]
Avoid using erase()d iterator
After calling erase(it), 'it' is no longer valid and should not be
used as it was in the 'it++' of the 'for' loop. We change to
update 'it' to the result of erase(), and only perform 'it++' if
we're not erasing it.
Test: TreeHugger
Change-Id: If7889fdca76a6883aeb4341be1a6fff466585e29
Greg Kaiser [Tue, 26 Mar 2019 16:09:28 +0000 (09:09 -0700)]
btif_storage: Avoid extra std::string copies
When a function takes a const std::string reference for an
argument, it's inefficient to pass in std::string::c_str().
Test: TreeHugger
Change-Id: Ibd00c10a08ab853875fd16739bce5851f6b42639
Yi Kong [Tue, 2 Apr 2019 08:42:13 +0000 (01:42 -0700)]
Merge "Fix use of uninitialised variable" am:
52b5f32e07 am:
0c80cbcda5
am:
be18e1cc64
Change-Id: If4857a8f3ab8d024e0e2358f377e104437b61757
Yi Kong [Tue, 2 Apr 2019 08:24:19 +0000 (01:24 -0700)]
Merge "Fix use of uninitialised variable" am:
52b5f32e07
am:
0c80cbcda5
Change-Id: I283c56324359e9cdb5399860498392a4fb4294d7
Yi Kong [Tue, 2 Apr 2019 08:16:31 +0000 (01:16 -0700)]
Merge "Fix use of uninitialised variable"
am:
52b5f32e07
Change-Id: I315935b706a7386547caac06c8e8f981e71e7431
Yi Kong [Tue, 2 Apr 2019 08:04:02 +0000 (08:04 +0000)]
Merge "Fix use of uninitialised variable"
Hansong Zhang [Tue, 2 Apr 2019 04:32:04 +0000 (21:32 -0700)]
Merge "Disable Link layer socket device test in rootcanal" am:
460d035101 am:
38383e6aac
am:
946b86e232
Change-Id: Iee48bb4f3146effba2760a84055e70967c096a80
Hansong Zhang [Tue, 2 Apr 2019 04:28:49 +0000 (21:28 -0700)]
Merge "Disable Link layer socket device test in rootcanal" am:
460d035101
am:
38383e6aac
Change-Id: If5cec54274c84543ee09e3b0a4eeba2509372bdc
Hansong Zhang [Tue, 2 Apr 2019 04:23:36 +0000 (21:23 -0700)]
Merge "Disable Link layer socket device test in rootcanal"
am:
460d035101
Change-Id: Id72df7c7f5336a337575c4bc29c5f0cee15b4d53
Treehugger Robot [Tue, 2 Apr 2019 04:14:33 +0000 (04:14 +0000)]
Merge "Disable Link layer socket device test in rootcanal"
Weichin Weng [Tue, 2 Apr 2019 02:53:04 +0000 (19:53 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist"" am:
864fe7ad39 -s ours am:
7421a10f21 -s ours
am:
87bdbf8264 -s ours
am skip reason: subject contains skip directive
Change-Id: I8e789d0d62cc2c8082892905030f778146a8705c
Weichin Weng [Tue, 2 Apr 2019 02:31:23 +0000 (19:31 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist"" am:
864fe7ad39 -s ours
am:
7421a10f21 -s ours
am skip reason: subject contains skip directive
Change-Id: I3a08d4f7b73e6aae0d1856b573b3a29079bf1beb
Weichin Weng [Tue, 2 Apr 2019 02:14:04 +0000 (19:14 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist""
am:
864fe7ad39 -s ours
am skip reason: subject contains skip directive
Change-Id: I5c1ff1bbe0f3c7fc665e6f89d4eabebecd26a961
Weichin Weng [Tue, 2 Apr 2019 01:48:09 +0000 (01:48 +0000)]
Merge "Revert "DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist""
Hansong Zhang [Mon, 1 Apr 2019 23:33:52 +0000 (16:33 -0700)]
Disable Link layer socket device test in rootcanal
Test: presubmit
Bug:
129537494
Change-Id: I852da314ab65052a0e1a794f5faa9f21e1249efe
Zach Johnson [Mon, 1 Apr 2019 21:55:28 +0000 (14:55 -0700)]
Merge "Fix assert macro logical inversion" am:
c5b38fae53 am:
4bcfcf5bb9
am:
0d1725218f
Change-Id: Ie6cf044bc8ef733ba079cd99d75798d18ba20b9f
OSDN Git Service
