OSDN Git Service
Jakub Pawlowski [Tue, 8 Jan 2019 02:39:29 +0000 (18:39 -0800)]
Clean up BLE connection state state machine
am:
cf7b381ce8
Change-Id: Ic045afbd0b7aa44b471b4f8c63c4adc6fab96989
Jakub Pawlowski [Wed, 2 Jan 2019 23:41:53 +0000 (00:41 +0100)]
Clean up BLE connection state state machine
* get rid of BLE_DIR_CONN - we never go into this state any more
* BLE_BG_CONN -> BLE_CONNECTING
* use btm_ble_get_conn_st instead of directly accessing control block
Test: compilation
Bug:
112827989
Change-Id: I4aa09a8b558c6f2161806a6d27bee0560fd19fd8
Jakub Pawlowski [Mon, 7 Jan 2019 10:59:10 +0000 (02:59 -0800)]
Move all HCI LE Create Connection management into single file
am:
a3580922c4
Change-Id: I96f122540d82b5f564023f3f2ff3d7b1a64b7a47
Jakub Pawlowski [Mon, 31 Dec 2018 11:54:04 +0000 (12:54 +0100)]
Move all HCI LE Create Connection management into single file
Currently handling of LE Create Connection, LE Create Connection
Cancel, LE Connection Complete and other HCI commands related to LE
connection establishment is in two separate files.
Move all this code into single file.
Bug:
112827989
Test: compilation
Change-Id: Ibc2f6ca2324f4df8a23c2722762d0e5297782b33
Jack He [Thu, 3 Jan 2019 18:52:18 +0000 (10:52 -0800)]
Remove BTM_SCO_INCLUDED flag
am:
050ef35fde
Change-Id: Id88e1c8b8e75764ede1b4d869ebaf1af4fb8ff8a
Jack He [Thu, 3 Jan 2019 01:38:53 +0000 (17:38 -0800)]
Remove BTM_SCO_INCLUDED flag
* Instead of removing SCO related code during compilation, platforms
should chose not to call SCO related methods when SCO is not supported
* For example, platforms can choose to not initialize HFP to avoid using
SCO commands
* This CL removes BTM_SCO_INCLUDED compile time flag to simplify code
flow and improve readability
Bug:
122279647
Test: mm -j40; run Bluetooth stack and make phone call
Change-Id: I67d290839091f66c289a428496304c8b3e1dbe21
Jakub Pawlowski [Mon, 31 Dec 2018 15:21:04 +0000 (07:21 -0800)]
Remove connection_manager from gatt namespace
am:
f20d94aeb8
Change-Id: I04df3ae34e992e68297e3704000d7f30c176bcad
Jakub Pawlowski [Fri, 28 Dec 2018 18:03:09 +0000 (19:03 +0100)]
Remove connection_manager from gatt namespace
connection_manager handles more than GATT. Celanup naming.
Bug:
112827989
Test: compilation
Change-Id: Id5fdfacb12921cff04204cf2589f73a7c6a0d01f
Jakub Pawlowski [Fri, 28 Dec 2018 21:25:05 +0000 (13:25 -0800)]
Get rid of is_ble_connecting and ble_connecting_bda
am:
23572544ba
Change-Id: Ib22fc7e693d9fdf31273b19c0a102aaf8c98bb38
Jakub Pawlowski [Fri, 28 Dec 2018 21:24:53 +0000 (13:24 -0800)]
Use conneciton_manager for all LE connection establishment
am:
ada2b3ee07
Change-Id: I3fd558723f18737fffb0fa7270c306cfd8aed5de
Jakub Pawlowski [Fri, 28 Dec 2018 21:24:41 +0000 (13:24 -0800)]
Get rid of direct connect queueing logic
am:
672d7b1f37
Change-Id: I43fd40bf6cf683843cbae944211b0a6b9430fb01
Jakub Pawlowski [Thu, 27 Dec 2018 20:02:13 +0000 (21:02 +0100)]
Get rid of is_ble_connecting and ble_connecting_bda
These variables make no sense any more, as we might be attempting
multiple connections at the same time.
Test: sl4a GattConnectTest, manual bonding test
Bug:
112827989
Change-Id: I7e1d01e8d80383b49ff9c20fb3758cef03c52882
Jakub Pawlowski [Wed, 19 Dec 2018 21:23:47 +0000 (22:23 +0100)]
Use conneciton_manager for all LE connection establishment
Test: sl4a GattConnectTest, manual bonding test
Bug:
112827989
Change-Id: I55878e03d268c43002e22ce4ebfbf0e334523882
Jakub Pawlowski [Mon, 17 Dec 2018 12:59:54 +0000 (13:59 +0100)]
Get rid of direct connect queueing logic
Instead of queueing requests, we should use whitelist to process the
requests simulteanously.
This patch does remove the queueing logic, succeeding patch will add the
logic to schedule through whitelist.
Test: compilation
Bug:
112827989
Change-Id: Ia7132812f704658ecb6919e52c70b291e6874660
Jakub Pawlowski [Fri, 21 Dec 2018 22:23:16 +0000 (14:23 -0800)]
Call btm_ble_set_conn_st before on_connection_complete
am:
a22a78f3b3
Change-Id: I97d4f45aa54e6798204e0227c69ac91621294501
Jakub Pawlowski [Fri, 21 Dec 2018 16:16:01 +0000 (17:16 +0100)]
Call btm_ble_set_conn_st before on_connection_complete
on_connection_complete can trigger BTM_WhiteListRemove, which sends
"LE Create Connection Cancel" if the connection is pending.
Make sure connection state is updated before calling on_connection_complete.
Otherwise we send an unnecessary "LE Create Connection Cancel" request.
Bug:
112827989
Test: establish Direct connection with at least one device in the
background connection procedure. Verify HCI snoop log content
Change-Id: I1b8532f4e58d5ab62b471ce0bde6c48640c83ff7
Jakub Pawlowski [Thu, 20 Dec 2018 21:12:05 +0000 (13:12 -0800)]
Merge code in scanner/advertiser connection complete handler
am:
c8dfd0fb06
Change-Id: Ibaed9f65f68cedf670ac4f6d9c0f19c36ea45243
Jakub Pawlowski [Thu, 20 Dec 2018 21:11:52 +0000 (13:11 -0800)]
Unify code in scanner/advertiser connection complete handler.
am:
b295c481dd
Change-Id: I000cfd81b6caace4b6046b9a6757c4fc589cb0a4
Jakub Pawlowski [Thu, 20 Dec 2018 18:34:22 +0000 (10:34 -0800)]
Split l2cu_create_conn into two separate, transport-specific functions
am:
50a0ec23d7
Change-Id: I01f507afca510252ee1c294e953506b3301a9637
Jakub Pawlowski [Fri, 14 Dec 2018 18:53:59 +0000 (19:53 +0100)]
Merge code in scanner/advertiser connection complete handler
Test: sl4a GattConnectTest
Bug:
112827989
Change-Id: I860693c11c263643858cfa0b4e4deb6a9f231cdd
Jakub Pawlowski [Fri, 14 Dec 2018 18:38:44 +0000 (19:38 +0100)]
Unify code in scanner/advertiser connection complete handler.
btm_ble_set_conn_st is called in every possible scenario of
l2cble_scanner_conn_comp. Call it at start, instead of before each
return.
Test: sl4a GattConnectTest
Bug:
112827989
Change-Id: I969fc59b934dc1c7a52be00741fdf38402545b26
Jakub Pawlowski [Fri, 14 Dec 2018 14:15:54 +0000 (15:15 +0100)]
Split l2cu_create_conn into two separate, transport-specific functions
There is no common logic between LE and BR/EDR paths.
Test: compilation
Bug:
112827989
Change-Id: I507d3a0d8efa0e4936b22722a9c1cc846e0be3bd
Ted Wang [Thu, 20 Dec 2018 06:31:27 +0000 (22:31 -0800)]
Merge "Fix mtu assignment with correct value"
am:
55c0aa19be
Change-Id: I3cc2bed544165ee45dbf7646ab13ac4258ce2ab2
Ted Wang [Thu, 20 Dec 2018 06:16:47 +0000 (06:16 +0000)]
Merge "Fix mtu assignment with correct value"
Nick Kralevich [Thu, 20 Dec 2018 00:12:10 +0000 (16:12 -0800)]
Merge "use epoll_create1"
am:
b0cbd21cb2
Change-Id: Ie4a8c3462707aedc9676340ae06487f615e32776
Treehugger Robot [Wed, 19 Dec 2018 23:51:28 +0000 (23:51 +0000)]
Merge "use epoll_create1"
Hansong Zhang [Wed, 19 Dec 2018 22:09:47 +0000 (14:09 -0800)]
Enable BLE background connection when stack is started
am:
f91d55816c
Change-Id: Idc622903ea84149956bcbb13daa0903ab8396e78
Hansong Zhang [Tue, 17 Jul 2018 23:24:24 +0000 (16:24 -0700)]
Enable BLE background connection when stack is started
Remove variable btm_cb.ble_ctr_cb.bg_conn_type. We can enable the
background mode when the Bluetooth stack is started and don't have
to wait until the first background connection request from HID
Device/Hearing Aid/GATT. As soon as we add the first device to white
list, the stack will send HCI Create Connection (White List) command.
Test: manual. Bond to a BLE mouse and turn off/on Bluetooth. Also test
with initiating another direct/white list connection while another white
list connection is pending
Bug:
111562702
Bug:
112827989
Change-Id: I82a476489d181d17aa1c1da8202df1be76928d77
Jakub Pawlowski [Wed, 19 Dec 2018 19:20:21 +0000 (11:20 -0800)]
Revert "Remove redundant GATT_StartIf"
am:
b22ea41685
Change-Id: I4fba57ad6c2f856109afb74331bdf3e621794899
Jakub Pawlowski [Wed, 19 Dec 2018 12:43:03 +0000 (13:43 +0100)]
Revert "Remove redundant GATT_StartIf"
This change broke initial HID connection.
This reverts commit
cb45b1e380126f300d9f7d89a8382438c5d06cd3.
Stanley Tng [Tue, 18 Dec 2018 21:17:20 +0000 (13:17 -0800)]
Merge "Add stng@google.com to the OWNERS list"
am:
efc194ae59
Change-Id: I042d5406886c56f1e7fd2fc52ea46f9c7358a970
Treehugger Robot [Tue, 18 Dec 2018 21:11:28 +0000 (21:11 +0000)]
Merge "Add stng@google.com to the OWNERS list"
Dan Shi [Tue, 18 Dec 2018 19:21:54 +0000 (11:21 -0800)]
Merge "Add a host test for net_test_avrcp"
am:
9f3afe4957
Change-Id: Ia2cae467aabd10bd9b713bc8c108ca1c297ca8fa
Treehugger Robot [Tue, 18 Dec 2018 19:05:15 +0000 (19:05 +0000)]
Merge "Add a host test for net_test_avrcp"
Stanley Tng [Tue, 18 Dec 2018 18:05:38 +0000 (10:05 -0800)]
Merge "Make sure Hearing Aids' Connection Intervals is unchanged"
am:
be5124ed3d
Change-Id: I8179c5990b1329874a2f5f3d9d5b926f4708e933
Treehugger Robot [Tue, 18 Dec 2018 17:04:26 +0000 (17:04 +0000)]
Merge "Make sure Hearing Aids' Connection Intervals is unchanged"
Ted Wang [Tue, 18 Dec 2018 02:31:06 +0000 (10:31 +0800)]
Fix mtu assignment with correct value
Assigned mtu value with correspond avct channel configuration
Bug:
120524683
Test: manual
Change-Id: Idb70c678cef1d704e232aef8706082a48b073ef8
Stanley Tng [Tue, 28 Aug 2018 23:06:55 +0000 (16:06 -0700)]
Add stng@google.com to the OWNERS list
Test: N/A
Change-Id: Ic164086fc97fa72aa68ad751b35f339fa71233bb
Nick Kralevich [Mon, 17 Dec 2018 17:09:43 +0000 (09:09 -0800)]
use epoll_create1
epoll_create leaks file descriptors. Use epoll_create1(EPOLL_CLOEXEC)
instead.
Bug:
120983106
Test: compiles and boots
Change-Id: I40abaaea6dad641dc03d141adb29e963e853edc4
Stanley Tng [Fri, 14 Dec 2018 01:31:31 +0000 (17:31 -0800)]
Make sure Hearing Aids' Connection Intervals is unchanged
Make sure that the connection interval of the LE Connection remains the
desired one and reset it if this interval gets changed.
Test: Manual with Hearing Aids device and repeated
connection/disconnection
Bug:
117886712
Change-Id: Id11d1d2e7901bfbbc9c452b94aba968afbc52ee0
Dan Shi [Sat, 15 Dec 2018 01:17:40 +0000 (17:17 -0800)]
Add a host test for net_test_avrcp
Bug:
111921389
Test: atest
Change-Id: I26e4036bb76271ac6181429c904efe0f8b438256
Dan Shi [Sat, 15 Dec 2018 01:12:41 +0000 (17:12 -0800)]
Merge "List test_config_template to android platform only."
am:
d41f810b28
Change-Id: I131e44269981e905f6d4917f86a906d8dd0edd86
Dan Shi [Sat, 15 Dec 2018 01:03:29 +0000 (01:03 +0000)]
Merge "List test_config_template to android platform only."
Dan Shi [Fri, 14 Dec 2018 17:56:36 +0000 (09:56 -0800)]
List test_config_template to android platform only.
This allows host side test config to be auto-generated from the right
template.
Bug:
120993548
Test: m -j net_test_avrcp && atest net_test_avrcp --host
Change-Id: I003713ea3c1c4c1c0686551828d817227ec19019
Jakub Pawlowski [Fri, 14 Dec 2018 09:56:57 +0000 (01:56 -0800)]
Use White List for direct connection establishment to multiple devices
am:
cab1ae1127
Change-Id: I72d61ae5db9a9924fa10c23b74794be56370035c
Jakub Pawlowski [Fri, 14 Dec 2018 08:54:00 +0000 (00:54 -0800)]
Remove unused battery level support
am:
c79ab7241c
Change-Id: Ia624db04e97c94e0b93f1a95723318d36b243743
Jakub Pawlowski [Fri, 14 Dec 2018 08:53:43 +0000 (00:53 -0800)]
Merge "Remove redundant GATT_StartIf"
am:
76037ac30a
Change-Id: I77e6f64ea666ce524fc11df625304db0c7f0d136
Jakub Pawlowski [Wed, 14 Nov 2018 15:15:04 +0000 (16:15 +0100)]
Use White List for direct connection establishment to multiple devices
Currently, we implement GAP Direct Connect procedure exactly as the spec
says: we attempt connection to just one device.
This means that an app doing Direct Connection can take over the ability
to establish connections, and if it repeats the request, can cause other
devices to not connect.
From now on, we will use White List for both Background and Direct
connections. When there is at least one direct connection, we will
increase the scan parameters used for connection.
Bug:
112827989
Test: added unittests, also sl4a GattConnectTest
Change-Id: Ic0b2f631e3c84d5e8e0f4683b0148f031bfd5639
Jakub Pawlowski [Thu, 13 Dec 2018 23:27:11 +0000 (00:27 +0100)]
Remove unused battery level support
Change-Id: I88239a835562a5e3c32b830e4c2c31fed1f107b3
Jakub Pawlowski [Fri, 14 Dec 2018 08:40:04 +0000 (08:40 +0000)]
Merge "Remove redundant GATT_StartIf"
Jakub Pawlowski [Thu, 13 Dec 2018 16:53:15 +0000 (17:53 +0100)]
Remove redundant GATT_StartIf
GATT_StartIf is just sending connect callback about all currently
connected devices, even ones that this app is not interested in.
For btif/java apps, we will trigger connection attempt to just one
device right after registration, which would trigger connect callback
anyway.
For all bta layer apps, they do guard inside connect callback to make
sure code is triggered for already known device, but the devices are
considered as known only after they already connected, and some event
triggered app to create control block.
Thus, GATT_StartIf is surplus feature that should be removed.
Test: run all sl4a GATT tests
Change-Id: I8c45b92dbbf80894c32bb870eb392e766063c934
Zach Johnson [Thu, 13 Dec 2018 21:49:38 +0000 (13:49 -0800)]
Merge "Pass package name as a part of startDiscovery"
am:
62e1f765bc
Change-Id: I3911f27f80b99ab28c91bd8a56cceefba5357fe6
Xin Li [Thu, 13 Dec 2018 21:27:59 +0000 (13:27 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
am:
cb7dcad70d -s ours
Change-Id: I3937cd25882e43468acb0d0192a5ccd34aa59091
Xin Li [Thu, 13 Dec 2018 19:25:51 +0000 (11:25 -0800)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
am:
1083b621e4 -s ours
Change-Id: I050265331bd4a18405f7d6f93b03125a1fc659ae
Chih-Hung Hsieh [Thu, 13 Dec 2018 18:48:26 +0000 (10:48 -0800)]
Fix performance-for-range-copy warnings
am:
01a40403d7
Change-Id: Ife0d8af7af4a5ac26dfe7d735bbc65460d1beb70
Treehugger Robot [Thu, 13 Dec 2018 12:42:58 +0000 (12:42 +0000)]
Merge "Pass package name as a part of startDiscovery"
Treehugger Robot [Thu, 13 Dec 2018 05:45:20 +0000 (05:45 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
Zach Johnson [Thu, 13 Dec 2018 01:13:29 +0000 (17:13 -0800)]
Pass package name as a part of startDiscovery
Test: manual
Bug:
118347252
Change-Id: I52adf73009a9766ad9aabf41657187343a2d0f41
Chih-Hung Hsieh [Wed, 12 Dec 2018 22:30:52 +0000 (14:30 -0800)]
Fix performance-for-range-copy warnings
Bug:
30413223
Test: make with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=-*,performance*
Change-Id: I7d5537c24c39d5c42ac17c8a67646e4b9321d6bb
Jakub Pawlowski [Wed, 12 Dec 2018 08:30:59 +0000 (00:30 -0800)]
Turn stack/gatt/conneciton_manager.cc into text file
am:
fef2539cd2
Change-Id: I95b2a8c2136819491f4aafc38e6fb0a782e898ec
Jakub Pawlowski [Tue, 11 Dec 2018 20:53:58 +0000 (21:53 +0100)]
Turn stack/gatt/conneciton_manager.cc into text file
Change-Id: I031bfaa1745de55aeb0a0dbde3a7a67be0f9c982
Myles Watson [Wed, 12 Dec 2018 05:14:36 +0000 (21:14 -0800)]
Merge changes I7f8b5cfd,I68d65028
am:
1b29fe6e18
Change-Id: I00f505eb8b71e21e6a2bc778e41ee9a0f8e35fc3
Treehugger Robot [Wed, 12 Dec 2018 05:05:27 +0000 (05:05 +0000)]
Merge changes I7f8b5cfd,I68d65028
* changes:
test_vendor: Add PacketBuilder classes
test_vendor: Add PacketView for copyless parsing
Xin Li [Tue, 11 Dec 2018 22:45:08 +0000 (14:45 -0800)]
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
Bug:
120502534
Change-Id: Icdcf2220fd28f92b182da73bee207151e80db295
TreeHugger Robot [Tue, 11 Dec 2018 21:49:24 +0000 (21:49 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master
Zach Johnson [Tue, 11 Dec 2018 08:26:18 +0000 (00:26 -0800)]
Merge "OWNERS -eisenbach, +zachoverflow"
am:
55c7b8ba5d
Change-Id: Ib3b6c7398a8a749ab6e19d202cde14250d3024dd
Zach Johnson [Tue, 11 Dec 2018 04:21:52 +0000 (04:21 +0000)]
Merge "OWNERS -eisenbach, +zachoverflow"
Xin Li [Mon, 10 Dec 2018 22:22:38 +0000 (14:22 -0800)]
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
Bug:
120502534
Change-Id: I71b31fb1bf8a4c2b2f471b54b5a74bc2191c9693
Jakub Pawlowski [Tue, 11 Dec 2018 00:20:46 +0000 (16:20 -0800)]
Fix GATT not working due to address mismatch
am:
f4b2f61690
Change-Id: Id435aecebda5a8cb5195353616bbfeb8ec9a87ec
Myles Watson [Wed, 14 Nov 2018 00:56:38 +0000 (16:56 -0800)]
test_vendor: Add PacketBuilder classes
Templated PacketBuilder class for inserting fixed width
types with the correct endianness.
Test: rootcanal-packets_test_host --gtest_filter=*PacketBuilderEndian*
Change-Id: I7f8b5cfd225ebae35f310b44fc0782b940a23007
Myles Watson [Wed, 7 Nov 2018 20:10:46 +0000 (12:10 -0800)]
test_vendor: Add PacketView for copyless parsing
A View is holds bounds and a shared pointer.
A PacketView is a forward list of View, templated for endianness.
A BaseIterator iterates over PacketViews.
An Iterator is a BaseIterator with extract, which is templated for endianness.
Test: rootcanal-packets_test_host
Change-Id: I68d6502861be61f411c0f5f2da33ead3d2392694
Andre Eisenbach [Tue, 4 Sep 2018 17:17:20 +0000 (10:17 -0700)]
OWNERS -eisenbach, +zachoverflow
Jakub Pawlowski [Thu, 6 Dec 2018 18:32:37 +0000 (19:32 +0100)]
Fix GATT not working due to address mismatch
If the initial connection is established when using RPA, device can
later decide to use it's Identity Address for reconnections, if it
doesn't care about privacy.
When we receive such Identity Address, we must translate it into pseudo
address before passing it further down the stack.
Test: Connect to device using RPA, try to reconnect when it advertise
it's Public address
Change-Id: Icb8eed25e1aad7003f1a3e0fed684168a8344544
Jack He [Mon, 10 Dec 2018 00:15:32 +0000 (16:15 -0800)]
Config: Reduce LOG(WARNING) to VLOG(1) when config key is not found
am:
fe8658175f
Change-Id: I87fd172353352e4ad79fcf801ebdcfcf7eefebbb
Jack He [Fri, 7 Dec 2018 21:58:12 +0000 (13:58 -0800)]
Config: Reduce LOG(WARNING) to VLOG(1) when config key is not found
Fixes:
120495903
Test: make
Change-Id: I724b8883ea400ed3c79fe31b75f1e2aa65b45b4d
Peter Collingbourne [Fri, 7 Dec 2018 00:54:19 +0000 (16:54 -0800)]
Merge "Preserve x18 while calling aptX encoder libraries."
am:
b1db2b8792
Change-Id: Ie19afe9335e95128fa4f0411e2c6e1f9758a9791
Peter Collingbourne [Fri, 7 Dec 2018 00:47:06 +0000 (00:47 +0000)]
Merge "Preserve x18 while calling aptX encoder libraries."
Peter Collingbourne [Mon, 19 Nov 2018 20:58:18 +0000 (12:58 -0800)]
Preserve x18 while calling aptX encoder libraries.
Shadow call stack (SCS) is a security mitigation that uses a
separate stack (the SCS) for return addresses. In versions of
Android newer than P, the compiler normally cooperates with the
system to ensure that the SCS address is always stored in register
x18. This requires that everything in a process that uses SCS is
built with -ffixed-x18. However, two libraries (libaptX_encoder.so
and libaptXHD_encoder.so) are supplied in binary format and were
not compiled with -ffixed-x18. We are working with the vendor to get
these libraries rebuilt with -ffixed-x18, but until then, we need to
prevent this library from clobbering x18 so that we can turn on SCS
in the Bluetooth process.
Bug:
112907825
Bug:
120621517
Change-Id: Id27829ed5696903c42b4aeb75c3b3880c97a3a36
weichinweng [Thu, 6 Dec 2018 03:07:23 +0000 (19:07 -0800)]
Merge "Hearing Aid: Add clear conn_id and close ctrl UIPC when BT turn off"
am:
b946c2690a
Change-Id: Ied576f7bc2ba217facb6a2d16ccd4e2734b57a3f
Treehugger Robot [Thu, 6 Dec 2018 02:43:24 +0000 (02:43 +0000)]
Merge "Hearing Aid: Add clear conn_id and close ctrl UIPC when BT turn off"
Ivan Lozano [Wed, 5 Dec 2018 23:58:50 +0000 (15:58 -0800)]
Merge "Enable bounds sanitization in Bluetooth."
am:
ec74937aa0
Change-Id: Ie1a58ea6002a2ce5ba36d9a5ca870a6db1fc4614
Ivan Lozano [Wed, 5 Dec 2018 23:38:16 +0000 (23:38 +0000)]
Merge "Enable bounds sanitization in Bluetooth."
Srinu Jella [Wed, 5 Dec 2018 22:30:51 +0000 (14:30 -0800)]
Merge "Group BR-EDR related SDP variables under transport"
am:
1068f028e1
Change-Id: Idb6f348ffea7350cbc6ae8e9fbf24938d8f6a2c9
Treehugger Robot [Wed, 5 Dec 2018 22:04:09 +0000 (22:04 +0000)]
Merge "Group BR-EDR related SDP variables under transport"
Jack He [Wed, 5 Dec 2018 02:15:51 +0000 (18:15 -0800)]
Metrics: Fix a typo in log
am:
015dd9392f
Change-Id: Ib15c2fad51eb1569dfa9589fc39bb7595ed2c5bc
Jack He [Tue, 4 Dec 2018 22:30:28 +0000 (14:30 -0800)]
Metrics: Fix a typo in log
Test: make
Change-Id: I92a49c62ebf13d8da7f13b39c426d0eb14a83db6
Bill Rassieur [Tue, 4 Dec 2018 17:00:02 +0000 (17:00 +0000)]
Merge PQ1A.181205.006 from Pi-QPR1-Release into ToT for Pi-Platform release.\n\nBUG:
120448245
Change-Id: I39b32c98eac813e96ba19087a27c97d0da02ab5e
Srinu Jella [Thu, 11 Feb 2016 14:17:39 +0000 (19:47 +0530)]
Group BR-EDR related SDP variables under transport
Use Case: Random RNR initiated after HOGP Keyboard disconnection
steps:
1. keep madcatz in advertisement mode and scan, pair from DUT.
2. keep dailog Keyboard in advertisement mode and scan, pair from DUT.
3. Take Keyboard out of range to initiate disconnection from remote
or initiate disconnection from remote.
Failure: DUT trying to do RNR to random device.
Root Cause: when the disconnection happened for LE device, it sets
the wait_disc to true, that is causing random RNR to go for BR-EDR
device.
Fix: Group all BR-EDR related SDP variables under transport check
so that if some other operation on LE will not corrupt these BR-EDR
variables to mislead.
Test: code compilation.
Bug:
69031582
Change-Id: Ic9003f2b85bbaaa30b201b8a639a9d9b52055ac5
Jakub Pawlowski [Tue, 4 Dec 2018 10:42:23 +0000 (02:42 -0800)]
Split Timer into OnceTimer and RepeatingTimer
am:
5cf0304979
Change-Id: Ie3d704b95231953a8cb602cc0b279a94a6f8081a
Jakub Pawlowski [Mon, 3 Dec 2018 15:50:40 +0000 (16:50 +0100)]
Split Timer into OnceTimer and RepeatingTimer
Follow the naming convention in libbase, where Callback was split into
OnceCallback, and RepeatingCallback, to make it obvious how many times
callback is expected to be called.
Test: unit tests were split from TimerTest into OnceTimerTest and
RepeatingTimerTest
Bug:
110303473
Change-Id: Ibbb9bb74a2e6e1a0f0f74c6ec44f63c5a4a1537f
weichinweng [Tue, 27 Nov 2018 05:47:25 +0000 (13:47 +0800)]
Hearing Aid: Add clear conn_id and close ctrl UIPC when BT turn off
* On some condition, BT will stay on BLE_ON state when BT turn off. For
the case, Hearing Aid should be correctly disconnected and ctrl UIPC
close until next BT turn on.
* This CL add clear BtaGATTQueue and Close GATTC to make sure Queue
clean and HA enter disconnected state. And don't restart ctrl UIPC if
HearingAid is shutdown.
Bug:
118803637
Test: make, BT off/on when play A2DP and an app registered.
Change-Id: I1c52307637ee6b34222de9308dcfe1392ad170e8
Jack He [Sat, 1 Dec 2018 00:17:05 +0000 (16:17 -0800)]
Test: Save SSR dump after test
am:
268b88c948
Change-Id: I34ae79fdf0fcdb246d8be40970b785d9dee92e9b
Jack He [Fri, 30 Nov 2018 00:51:22 +0000 (16:51 -0800)]
Test: Save SSR dump after test
* Save SSR dump from /data/vendor/ssrdump after test invocation
Bug:
120098494
Test: atest :postsubmit
Change-Id: Iafc1666c8cc9fbc7f69b909be630b3d0c1445fe4
Jack He [Fri, 30 Nov 2018 08:37:43 +0000 (00:37 -0800)]
Merge "Metrics: Add Bluetooth address obfuscator"
am:
17d56d8962
Change-Id: I02e0c1a734e55ead434c7e0b3a1696a03eaa027d
Stanley Tng [Fri, 30 Nov 2018 08:19:30 +0000 (00:19 -0800)]
Merge "Assert if alarm callback is null"
am:
dec5621902
Change-Id: I4241a172b6245bd7fdb4837c494882b8ea03416f
Treehugger Robot [Fri, 30 Nov 2018 07:59:20 +0000 (07:59 +0000)]
Merge "Metrics: Add Bluetooth address obfuscator"
Treehugger Robot [Fri, 30 Nov 2018 01:58:17 +0000 (01:58 +0000)]
Merge "Assert if alarm callback is null"
Jack He [Fri, 16 Nov 2018 10:59:43 +0000 (02:59 -0800)]
Metrics: Add Bluetooth address obfuscator
* Add an address obfuscator that takes a 256-bit randomly generated
salt and hashes a Bluetooth MAC address using HMAC-SHA256 algorithm
* The salt is generated per Android device during the first time
Fluoride native layer is initialized after a connectivity reset
* The output of the above operation is an unique identifier for a
Bluetooth device on the same Android device, but yet remains
anonymous across different Android devices.
* Add a logging method loghex(std::array) that allows dumping integral
arrays into a hex string
* Add more error logging to btif_config_get_bin() so that we know why it
fails in the future
* Change mutex in btif_config to recursive_mutex to avoid deadlock when
calling btif_config API functions with API function
Bug:
112969790
Test: mm -j40, bluetooth_test_common
Change-Id: I11f01cc82fe805c97fd7c86ad83b3d324ee5af53
Stanley Tng [Mon, 26 Nov 2018 22:44:38 +0000 (14:44 -0800)]
Assert if alarm callback is null
Crash the system when callback is null. This will help to identify and debug the problem. Previously, we got a CFI crash which is hard to isolate.
Test: Run with Hearing Aids but did not simulate the error condition
Bug:
119533256
Change-Id: I9bc2af7c3c405bea3a57c5feb9b213614484507f
Bill Yi [Thu, 29 Nov 2018 02:35:03 +0000 (18:35 -0800)]
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
Change-Id: I2a349df7ad02b6b57044fe77d92b329e1a5afda0