OSDN Git Service
Ugo Yu [Wed, 23 Jan 2019 08:13:05 +0000 (00:13 -0800)]
Merge "Add binder interfaces for metadata APIs" am:
5ac84e7897
am:
827d9efad2
Change-Id: I26f5457dcf999492b2090705b0efe6450a7d8a8a
Ugo Yu [Wed, 23 Jan 2019 07:50:47 +0000 (23:50 -0800)]
Merge "Add binder interfaces for metadata APIs"
am:
5ac84e7897
Change-Id: Ifaf958504f373f611788235d8b2aa470a99c9d4b
Treehugger Robot [Wed, 23 Jan 2019 07:38:06 +0000 (07:38 +0000)]
Merge "Add binder interfaces for metadata APIs"
Stanley Tng [Wed, 23 Jan 2019 02:16:58 +0000 (18:16 -0800)]
[automerger skipped] Fix the LE CoC SL4A Test failure due to length check am:
07ff96727c
am:
091035cd2a -s ours
am skip reason: SHA1
091035cd2a skipped by user stng
Change-Id: I79dd3dff38117cdbcbdc13a4b09b9835c93b4946
Stanley Tng [Wed, 23 Jan 2019 01:07:35 +0000 (17:07 -0800)]
Fix the LE CoC SL4A Test failure due to length check
am:
07ff96727c
Change-Id: I06461df508cd8f0246b2673db2c1810aab3c9322
Ugo Yu [Sat, 12 Jan 2019 00:13:16 +0000 (08:13 +0800)]
Add binder interfaces for metadata APIs
Bug:
121051445
Test: build pass
Change-Id: Icd51b7cc0a4dec5a2bffec4ded67caffeedb126b
Stanley Tng [Tue, 11 Dec 2018 22:45:13 +0000 (14:45 -0800)]
Fix the LE CoC SL4A Test failure due to length check
Fix a regression from the previous CL that checks the buffer length
before doing a memcpy. The previous check is too strict causing valid
sized buffers to be rejected. The length check is incorrect and off by the header size.
Bug:
117306992
Bug:
112321180
Test: Run the LE CoC SL4A Tests
Change-Id: I9bbcd58460a02394010f74a18e9ebdbcd546d43d
Merged-In: I9bbcd58460a02394010f74a18e9ebdbcd546d43d
(cherry picked from commit
fcb1994de1f6ee34b8dc6804a2b32e20bf138073)
Suren Baghdasaryan [Tue, 22 Jan 2019 21:58:08 +0000 (13:58 -0800)]
Add libprocessgroup dependency and fix sched_policy include am:
8ef9dc6f3f
am:
a5b1ff8f52
Change-Id: I332a3251035d209f454fc5ccd5eca6b6810e03f2
Suren Baghdasaryan [Tue, 22 Jan 2019 21:24:03 +0000 (13:24 -0800)]
Add libprocessgroup dependency and fix sched_policy include
am:
8ef9dc6f3f
Change-Id: If5ec34928a56d7d0f6daeb16b91a693ca0646a03
Suren Baghdasaryan [Thu, 20 Dec 2018 01:36:37 +0000 (17:36 -0800)]
Add libprocessgroup dependency and fix sched_policy include
libbt-utils uses set_sched_policy which is now implemented inside
libprocessgroup. Add required dependency and header file include.
Exempt-From-Owner-Approval: janitorial
Bug:
111307099
Test: builds, boots
Merged-In: I4d0dcfad22b30ac249a7874b42a7121e2ffedadb
Change-Id: I4d0dcfad22b30ac249a7874b42a7121e2ffedadb
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Jack He [Thu, 17 Jan 2019 23:21:47 +0000 (15:21 -0800)]
Merge "Metric: Add logging for link layer connection events" am:
e6b80778a8
am:
7b5765948e
Change-Id: I15b379d16e089c64e3de54ac96ae8d8c5099df06
Xin Li [Thu, 17 Jan 2019 23:01:56 +0000 (15:01 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master" am:
f15c1197f5 -s ours
am:
98aa467973 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifbf5bab360131698dc9d2384c4bee332cbb8d464
Jack He [Thu, 17 Jan 2019 22:57:39 +0000 (14:57 -0800)]
Merge "Metric: Add logging for link layer connection events"
am:
e6b80778a8
Change-Id: Icaf506c40c16b12b63cac0c5327f8c68f9033c9e
Xin Li [Thu, 17 Jan 2019 22:44:52 +0000 (14:44 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master"
am:
f15c1197f5 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib82454185f6d69fa695354c1ce488ad42ad990aa
Treehugger Robot [Thu, 17 Jan 2019 22:30:43 +0000 (22:30 +0000)]
Merge "Metric: Add logging for link layer connection events"
Xin Li [Thu, 17 Jan 2019 22:05:38 +0000 (14:05 -0800)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master am:
dfdcf1f0e0 -s ours
am:
c4bb52b4f3 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib69a65276a618024f463874256c4e2275dc3a5b7
Xin Li [Thu, 17 Jan 2019 21:53:32 +0000 (13:53 -0800)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master
am:
dfdcf1f0e0 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibf1cb4eab80383dba8f7a5bbfe2bb5bff95ca43f
Xin Li [Thu, 17 Jan 2019 21:19:42 +0000 (21:19 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master"
Stanley Tng [Thu, 17 Jan 2019 18:49:26 +0000 (10:49 -0800)]
Merge "Add new Hearing Aids commands to improve L/R Sync" am:
055a5f4056
am:
376b0e83e3
Change-Id: I8398824a2362b6af4419cad371a41519c9029723
Stanley Tng [Thu, 17 Jan 2019 18:45:08 +0000 (10:45 -0800)]
Merge "Add new Hearing Aids commands to improve L/R Sync"
am:
055a5f4056
Change-Id: I19b467c2f4a185c0ea6953b3697597997d33c871
Treehugger Robot [Thu, 17 Jan 2019 18:27:10 +0000 (18:27 +0000)]
Merge "Add new Hearing Aids commands to improve L/R Sync"
Stanley Tng [Thu, 17 Jan 2019 17:00:10 +0000 (09:00 -0800)]
Merge "Wait for Notifications before sending audio data" am:
2bd5ea5772
am:
a0e377ac0d
Change-Id: I24474c29c0b4bdc65148357dde18677e404f068c
Stanley Tng [Thu, 17 Jan 2019 16:55:25 +0000 (08:55 -0800)]
Merge "Wait for Notifications before sending audio data"
am:
2bd5ea5772
Change-Id: Ie9e4efb8efe0e287d7450b587aca0010459c648e
Treehugger Robot [Thu, 17 Jan 2019 15:25:39 +0000 (15:25 +0000)]
Merge "Wait for Notifications before sending audio data"
Stanley Tng [Tue, 1 Jan 2019 22:52:07 +0000 (14:52 -0800)]
Add new Hearing Aids commands to improve L/R Sync
Prototyping new commands to the Hearing Aids devices to improve the
Left/Right Sync issues. The new commands are:
1. Add a new byte parameter to the START command that indicates the
other side device is actively streaming or disconnected,
2. Whenever there is an LE Connection Update event from the phone BT
controller, send a new Status Update command to all connected devices,
3. Whenever one side gets disconnected or starts streaming, send a new
Status Update command to the other side to inform about this change.
Bug:
117778955
Bug:
120921220
Test: Manual Testing with Hearing Aids
Change-Id: I5c94867d4574802025e3b433573e52d3c40c9828
Stanley Tng [Wed, 26 Dec 2018 02:12:51 +0000 (18:12 -0800)]
Wait for Notifications before sending audio data
For the Hearing Aids Profile, wait for the notification status from the
devices after sending the Start command. The reason is that the devices
may be in low power mode and the phone should not start streaming audio
data to these devices until it is fully awake.
Test: Manual testing with Hearing Aids devices
Bug:
117778955
Bug:
120921220
Change-Id: I28b79e7e284d5e75864c0b12315fbb8bd47acf74
Jack He [Thu, 20 Dec 2018 23:46:17 +0000 (15:46 -0800)]
Metric: Add logging for link layer connection events
* Logs when there is an event affecting Bluetooth device's link
layer connection. Triggerred when there is a related HCI command
or event
* Users of this metrics can deduce Bluetooth device's connection state
from these events
* HCI commands are logged before the command is sent, after receiving,
command status, and after receiving command complete
event comes back
* HCI events are logged when they arrive
* Simplifies logic in btu_hcif_hdl_command_status() since p_cmd is never
null and we always ignore parameter total length field
* Call btm_identity_addr_to_random_pseudo() when parsing command status
packet for LE create connection, extended create connection,
add/remove/clear whitelist commands
DETAILS:
* Bluetooth classic commands:
- CMD_CREATE_CONNECTION
- CMD_DISCONNECT
- CMD_CREATE_CONNECTION_CANCEL
- CMD_ACCEPT_CONNECTION_REQUEST
- CMD_REJECT_CONNECTION_REQUEST
- CMD_SETUP_ESCO_CONNECTION
- CMD_ACCEPT_ESCO_CONNECTION
- CMD_REJECT_ESCO_CONNECTION
- CMD_ENH_SETUP_ESCO_CONNECTION
- CMD_ENH_ACCEPT_ESCO_CONNECTION
* Bluetooth low energy commands:
- CMD_BLE_CREATE_LL_CONN [Only logged when there is an error or initiator filter policy is 0x00]
- CMD_BLE_CREATE_CONN_CANCEL [Only logged when there is an error]
- CMD_BLE_EXTENDED_CREATE_CONNECTION [Only logged on error or when initiator filter policy is 0x00]
- CMD_BLE_CLEAR_WHITE_LIST
- CMD_BLE_ADD_WHITE_LIST
- CMD_BLE_REMOVE_WHITE_LIST
* Bluetooth classic events:
- EVT_CONNECTION_COMP
- EVT_CONNECTION_REQUEST
- EVT_DISCONNECTION_COMP
- EVT_ESCO_CONNECTION_COMP
- EVT_ESCO_CONNECTION_CHANGED
* Bluetooth low energy meta events:
- BLE_EVT_CONN_COMPLETE_EVT
- BLE_EVT_ENHANCED_CONN_COMPLETE_EVT
Bug:
112969790
Test: make and test drive statsd
Change-Id: Ib843dfa95bb6448c41dac261dabcf17947efda06
Tiansong Cui [Wed, 16 Jan 2019 16:49:50 +0000 (08:49 -0800)]
Allow bond request from devices with BTM_IO_CAP_NONE am:
c52062c078
am:
21b9e3e50a
Change-Id: I15305db379166df60f9db362e0757640ac899d0f
Tiansong Cui [Wed, 16 Jan 2019 16:40:30 +0000 (08:40 -0800)]
Allow bond request from devices with BTM_IO_CAP_NONE
am:
c52062c078
Change-Id: I50aa6393eb74fb83ea5878c7236930dc81f35bc1
Tiansong Cui [Tue, 15 Jan 2019 21:22:46 +0000 (13:22 -0800)]
Allow bond request from devices with BTM_IO_CAP_NONE
Devices with BTM_IO_CAP_NONE should still be able to create
(although unauthenticated) bond with other devices.
Bug: internal
122119496
Test: manual
Change-Id: Iac008d0199ca11d06db8c91cda821f992ba3d4ee
Xin Li [Tue, 15 Jan 2019 18:17:12 +0000 (10:17 -0800)]
DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master
Bug:
122685541
Change-Id: Iafca519871aab60f057bb7f6abc1bcf2f0394ba2
Xin Li [Tue, 15 Jan 2019 02:19:14 +0000 (18:19 -0800)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into stage-aosp-master
am:
d1540dd00a -s ours
am skip reason: subject contains skip directive
Change-Id: Ib4cacbf12afe380e31e507a4da05c1ed24660894
Xin Li [Tue, 15 Jan 2019 00:14:40 +0000 (16:14 -0800)]
DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into stage-aosp-master
Bug:
122685541
Change-Id: I579759f87bab672ef5189f9d13e8417651a04d60
Sal Savage [Mon, 14 Jan 2019 23:02:49 +0000 (15:02 -0800)]
Merge "Fix BT a bad/ out of bounds array read" am:
7da7696e07
am:
3e5b229b14
Change-Id: Ic087f8ab710e00b55a7174da329563a51e10c3ff
Sal Savage [Mon, 14 Jan 2019 22:12:00 +0000 (14:12 -0800)]
Merge "Fix BT a bad/ out of bounds array read"
am:
7da7696e07
Change-Id: Idca50acaa84f59f95800e94a846247824d0341ef
android-build-team Robot [Mon, 14 Jan 2019 22:03:03 +0000 (22:03 +0000)]
Snap for
5230900 from
aa9c1b4abdb2ca7beea467f7be82e83363a32b11 to pi-platform-release
Change-Id: I50623117c36dbe20a0c8d120a7115628a2f53566
Sal Savage [Mon, 14 Jan 2019 21:43:55 +0000 (21:43 +0000)]
Merge "Fix BT a bad/ out of bounds array read"
Manoj Babulal [Mon, 14 Jan 2019 14:34:57 +0000 (06:34 -0800)]
Merge "SMP: Fix invalid auth_req in LE Security Request handler" am:
6ab305324d
am:
7510bae535
Change-Id: Idf624b3c261f06f82089f81c718390eee691ba15
Manoj Babulal [Mon, 14 Jan 2019 14:29:36 +0000 (06:29 -0800)]
Merge "SMP: Fix invalid auth_req in LE Security Request handler"
am:
6ab305324d
Change-Id: I408779f11d8778ebd188239e6a5f21e30d0f8f51
Treehugger Robot [Mon, 14 Jan 2019 14:23:01 +0000 (14:23 +0000)]
Merge "SMP: Fix invalid auth_req in LE Security Request handler"
Jakub Pawlowski [Mon, 14 Jan 2019 09:56:58 +0000 (01:56 -0800)]
Do not crash on LE Create Connection "Command Disallowed" am:
9d52abf4d4
am:
fa5ea4cb1b
Change-Id: I5acfc319065ed6d2e2e30c769c826f8036b6e1f9
Jakub Pawlowski [Mon, 14 Jan 2019 09:32:03 +0000 (01:32 -0800)]
Do not crash on LE Create Connection "Command Disallowed"
am:
9d52abf4d4
Change-Id: Ie2db913998282a20ccf66406ada730347f240e5f
Jakub Pawlowski [Thu, 3 Jan 2019 14:13:11 +0000 (15:13 +0100)]
Do not crash on LE Create Connection "Command Disallowed"
Being in "Connecting" used to mean we are either doing direct
connection, or background connection procedure. Now we have just one
connection procedure. This means there is no ambiguity when the
controller responds with "Command Disallowed" - we know exactly which
state to go back to.
Bug:
110412113
Bug:
112827989
Test: there is no test, or reproduction scenarion to verify that
Ran GattConnectTest for sanity
Change-Id: I9ed1cdc7ae4032cda4e8a166310eca0004c7f9dc
Manoj Babulal [Thu, 27 Dec 2018 10:43:19 +0000 (02:43 -0800)]
SMP: Fix invalid auth_req in LE Security Request handler
Due to wrong pointer de-reference, auth_req value read
in smp_proc_sec_req (LE Security Request packet handler)
was invalid.
Logcat trace shows invalid auth_req value:
.. bt_smp : smp_proc_sec_req: auth_req=0xf9
....
.. bt_smp : smp_proc_sec_req: auth_req=0xe9
After the fix, auth_req value is correct:
.. bt_smp : smp_proc_sec_req: auth_req=0x1
....
.. bt_smp : smp_proc_sec_req: auth_req=0x5
This data flow can be traced in code on this path:
smp_data_received -> smp_sm_event -> smp_proc_sec_req
Issue seen after following change:
https://android-review.googlesource.com/c/platform/system/bt/+/492442
Issue was discovered during execution of PTS test
cases GAP/SEC/AUT/BV-13-C and GAP/SEC/AUT/BV-14-C.
Fixes:
122066779
Test: Verified logcat trace shows valid auth_req
value prints from smp_proc_sec_req() function
Change-Id: I072b4794fb56a05b7ac7f2f4ca606514d7524550
Adam Seaton [Fri, 11 Jan 2019 22:55:24 +0000 (22:55 +0000)]
January Pi-platform-release merges
Change-Id: Id66375f8b1f3329e82df3d0fdb06917c065209de
Sal Savage [Wed, 9 Jan 2019 20:50:07 +0000 (12:50 -0800)]
Fix BT a bad/ out of bounds array read
Bug:
121375525
Test: Used automotive hardware and verified that pairing and media
streaming and control still work and crashes no longer happen.
Change-Id: I3476425131718aded980f57a8b9be92a8e9f9d3b
Jakub Pawlowski [Fri, 11 Jan 2019 17:01:12 +0000 (09:01 -0800)]
Fix potential NULL dereference in smp_proc_confirm am:
3c3fbd869f
am:
c92f39f7bd
Change-Id: Ibaa9eb509f5228b00f6474bef190dced059b1662
Jakub Pawlowski [Fri, 11 Jan 2019 16:55:05 +0000 (08:55 -0800)]
Fix potential NULL dereference in smp_proc_confirm
am:
3c3fbd869f
Change-Id: I1b3175cb9a393da80adc52c886993af89788e48c
Jakub Pawlowski [Fri, 11 Jan 2019 12:43:33 +0000 (13:43 +0100)]
Fix potential NULL dereference in smp_proc_confirm
Bug:
122102910
Test: compilation
Change-Id: Idd16e1c1924165924847f1aad64ddd44a8a1b8ab
Jack He [Fri, 11 Jan 2019 00:46:58 +0000 (16:46 -0800)]
Merge "Fix bt_trace.h #define" am:
fa41623e98
am:
34ec29ab65
Change-Id: I025a6fe7c81d6fe85f78feaffb13750cb3889b78
Jack He [Fri, 11 Jan 2019 00:38:51 +0000 (16:38 -0800)]
Merge "Fix bt_trace.h #define"
am:
fa41623e98
Change-Id: I5bafe65f8e17b3daaae84d569878ba27a4ad2407
Treehugger Robot [Fri, 11 Jan 2019 00:21:24 +0000 (00:21 +0000)]
Merge "Fix bt_trace.h #define"
Dan Shi [Thu, 10 Jan 2019 23:06:50 +0000 (15:06 -0800)]
Add host tests to TEST_MAPPING am:
491407dbad
am:
cbed4516db
Change-Id: I9cf9bfe5cc4e74084eb0712f3636fa25a2a7e783
Dan Shi [Thu, 10 Jan 2019 23:00:45 +0000 (15:00 -0800)]
Add host tests to TEST_MAPPING
am:
491407dbad
Change-Id: I09538ad40d6d5c02f83fe9c870711ebbd7004c1e
Dan Shi [Thu, 10 Jan 2019 18:55:23 +0000 (10:55 -0800)]
Add host tests to TEST_MAPPING
Also added some missing test_suites setting.
Following tests don't have host_supported set to true in Android.bp:
net_test_audio_a2dp_hw
net_test_btif
net_test_btif_profile_queue
net_test_device
net_test_hci
net_test_stack
net_test_stack_ad_parser
net_test_stack_smp
Following tests failed to run in host with error "did not report any run":
net_test_performance
net_test_stack_rfcomm
Bug:
111921389
Test: system/bt$ atest --host :postsubmit
Change-Id: I5f55cead7a2ad1cadea48220f45781f4f74949dd
Jack He [Thu, 10 Jan 2019 05:00:05 +0000 (21:00 -0800)]
Remove code related to Health Device Profile and MCAP Protocol am:
238f8359a9
am:
0f94b1686a
Change-Id: Ic2f7a7297e650869d23944ed34fba183e8bd699b
Jack He [Thu, 10 Jan 2019 04:47:57 +0000 (20:47 -0800)]
Fix bt_trace.h #define
Test: make
Change-Id: Ie1177f2311db0b7b5dfb440f3f982d4a79aa460d
Jack He [Thu, 10 Jan 2019 04:51:00 +0000 (20:51 -0800)]
Remove code related to Health Device Profile and MCAP Protocol
am:
238f8359a9
Change-Id: Ib10cda753d45163b4d799ca4c1275fb43284c336
Jack He [Fri, 4 Jan 2019 01:11:24 +0000 (17:11 -0800)]
Remove code related to Health Device Profile and MCAP Protocol
* Health Device Profile (HDP) and MCAP protocol has been largely
replaced by BLE. New applications should use Bluetooth Low Energy
instead of legacy Bluetooth Health Device Profile
Bug:
111562841
Test: make, unit test, use Bluetooth
Change-Id: I3da1173a8a928af4b26a29e71746241c22af2236
Merged-In: I3da1173a8a928af4b26a29e71746241c22af2236
(cherry picked from commit
dc13609b58b2f6c6185951f650036f5098e19e92)
Jack He [Wed, 9 Jan 2019 22:21:53 +0000 (14:21 -0800)]
Merge "HCI: Simplify btu_hcif_hdl_command_status()" am:
e5e0a70209
am:
aa97fdca84
Change-Id: I8ed8bc5e8d832931dcf6e3aa6e03ed6ea47309db
Jack He [Wed, 9 Jan 2019 22:16:44 +0000 (14:16 -0800)]
Merge "HCI: Simplify btu_hcif_hdl_command_status()"
am:
e5e0a70209
Change-Id: Icc28b7e93f3f94b82bdbfc7ab923b12b985fdff3
Treehugger Robot [Wed, 9 Jan 2019 21:59:39 +0000 (21:59 +0000)]
Merge "HCI: Simplify btu_hcif_hdl_command_status()"
Stanley Tng [Wed, 9 Jan 2019 17:51:19 +0000 (09:51 -0800)]
Merge "Group all Hearing Aids device information together" am:
89be950b16
am:
4285cebeff
Change-Id: I02646285ae39ac9881c9621d5072c8fea7efaf32
Stanley Tng [Wed, 9 Jan 2019 17:47:12 +0000 (09:47 -0800)]
Merge "Group all Hearing Aids device information together"
am:
89be950b16
Change-Id: I803e04fb6d5f7322eea16aa2f9d3637643a8f00f
Treehugger Robot [Wed, 9 Jan 2019 17:36:40 +0000 (17:36 +0000)]
Merge "Group all Hearing Aids device information together"
Jack He [Wed, 9 Jan 2019 01:48:20 +0000 (17:48 -0800)]
HCI: Simplify btu_hcif_hdl_command_status()
* Move 2nd layer switch statements into top layer
* Check if p_cmd is nullptr at the beginning of the function so
that each case does not need to check it individually. p_cmd
is never null.
* Skip parameter total length at beginning of the function
Test: make, unit test, use Bluetooth for music and calls
Change-Id: I23cf983a1ade44bcea0b1009860efdfaf3b8bca8
Jack He [Wed, 9 Jan 2019 05:25:05 +0000 (21:25 -0800)]
HCI: Fix command status handling of HCI_QOS_SETUP am:
256800be50
am:
33d2d0b460
Change-Id: I207e9b1b1f18626f5ca7d81191ea13812f714465
Jack He [Wed, 9 Jan 2019 05:14:52 +0000 (21:14 -0800)]
HCI: Fix command status handling of HCI_QOS_SETUP
am:
256800be50
Change-Id: I13000c98920ea2b4e7816b47a41352f271af2943
Jack He [Wed, 9 Jan 2019 02:06:12 +0000 (18:06 -0800)]
Remove BTM_SCO_WAKE_PARKED_LINK flag am:
5213da9b4a
am:
0dac6177a5
Change-Id: I064334317d3e1ffa00a77acbfa2e835d3c449c0e
Jack He [Wed, 9 Jan 2019 02:02:03 +0000 (18:02 -0800)]
Remove BTM_SCO_WAKE_PARKED_LINK flag
am:
5213da9b4a
Change-Id: Id7868b58ada9e819fb8cb2fbb93ca5c874d0089d
Jack He [Wed, 9 Jan 2019 01:53:31 +0000 (17:53 -0800)]
HCI: Fix command status handling of HCI_QOS_SETUP
* QOS setup complete event was handled instead of QOS setup command
Test: make
Change-Id: I894099f369675bd25397ee0005c6838f39220eed
Stanley Tng [Fri, 21 Dec 2018 00:44:15 +0000 (16:44 -0800)]
Group all Hearing Aids device information together
A small refactor where the various information about a Hearing Aids
device is gathered into a class. Instead of passing a long list
of function parameters, it is cleaner to group them inside a single
class. It also makes it easier to add new elements in the future.
Test: Manual pair and audio stream with Hearing Aids
Bug:
119617521
Change-Id: I193b5cc915a6c36e7e36d1f06a5adcda7c17ab1c
Jack He [Sat, 5 Jan 2019 00:18:12 +0000 (16:18 -0800)]
Remove BTM_SCO_WAKE_PARKED_LINK flag
* Under majority of configurations, SCO connection can only be created
if in non-parked mode since SCO is a circuit switch link
Bug:
122375953
Test: make
Change-Id: I58569025b435953b964e5aded64b3ace27d4e73c
Jakub Pawlowski [Tue, 8 Jan 2019 02:43:39 +0000 (18:43 -0800)]
Clean up BLE connection state state machine am:
cf7b381ce8
am:
ef8722de04
Change-Id: I407fe4779390d07ab9a276a59941ae887e05a243
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
Stanley Tng [Mon, 7 Jan 2019 22:55:28 +0000 (14:55 -0800)]
[automerger skipped] Merge "DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu" into oc-dev am:
3fd73e4ad2 -s ours am:
af8cf98776 -s ours am:
56e54c0f07 -s ours
am:
4a0e17fd7e -s ours
am skip reason: change_id I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a with SHA1
c1fcbd5508 is in history
Change-Id: I414d07ea8dc28dd9f8ab84ba1a8229042d820768
Stanley Tng [Mon, 7 Jan 2019 22:54:57 +0000 (14:54 -0800)]
[automerger skipped] [automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0 skipped:
dff13d810c am:
47dcb6a458 am:
a2e761ac2b am:
4dc3df74c5 -s ours
am:
d36a3367b9 -s ours
am skip reason: change_id I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a with SHA1
c117a1c951 is in history
Change-Id: Ia31e2b3ca78faf0f211e2b705a6877a5ca9e8564
Stanley Tng [Mon, 7 Jan 2019 22:50:38 +0000 (14:50 -0800)]
[automerger skipped] Merge "DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu" into oc-dev am:
3fd73e4ad2 -s ours am:
af8cf98776 -s ours
am:
56e54c0f07 -s ours
am skip reason: subject contains skip directive
Change-Id: Id562d02c179dd9299f06d8d09fef15afc94cfb67
Stanley Tng [Mon, 7 Jan 2019 22:50:24 +0000 (14:50 -0800)]
[automerger skipped] [automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0 skipped:
dff13d810c am:
47dcb6a458 am:
a2e761ac2b
am:
4dc3df74c5 -s ours
am skip reason: subject contains skip directive
Change-Id: Iaac7919f35e29539fb245fe26428b9c378861e83
Stanley Tng [Mon, 7 Jan 2019 22:45:06 +0000 (14:45 -0800)]
[automerger skipped] Merge "DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu" into oc-dev am:
3fd73e4ad2 -s ours
am:
af8cf98776 -s ours
am skip reason: change_id I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a with SHA1
c1fcbd5508 is in history
Change-Id: Ib82a5c8869f17e93969906a55323e43a79628f4a
Stanley Tng [Mon, 7 Jan 2019 22:44:41 +0000 (14:44 -0800)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0 skipped:
dff13d810c am:
47dcb6a458
am:
a2e761ac2b
Change-Id: Ia655d085c410e45e44efc1fa1bb2737a7cccd310
Stanley Tng [Mon, 7 Jan 2019 22:42:23 +0000 (14:42 -0800)]
DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu
am:
c117a1c951
Change-Id: I9d5b61d1d1d67b083b937ca77037703cf2b15a60
Stanley Tng [Mon, 7 Jan 2019 22:40:43 +0000 (14:40 -0800)]
[automerger skipped] Merge "DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu" into oc-dev
am:
3fd73e4ad2 -s ours
am skip reason: change_id I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a with SHA1
c1fcbd5508 is in history
Change-Id: Ie17711d48b90d8921cf26dc501cdfb776c7ef47e
Stanley Tng [Mon, 7 Jan 2019 22:40:22 +0000 (14:40 -0800)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0 skipped:
dff13d810c
am:
47dcb6a458
Change-Id: Ief422a38b0c559b912038c038edc48854357b3bf
TreeHugger Robot [Mon, 7 Jan 2019 22:33:36 +0000 (22:33 +0000)]
Merge "DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu" into oc-dev
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 11:03:18 +0000 (03:03 -0800)]
Move all HCI LE Create Connection management into single file am:
a3580922c4
am:
ee9c5ed4c4
Change-Id: I571bc77f7a85188b0fcb692559a2309678acffd6
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
Stanley Tng [Tue, 11 Dec 2018 22:45:13 +0000 (14:45 -0800)]
DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu
Add check to make sure that data buffer is big enough to read the 2
bytes for length.
Also, fix a regression from the previous CL that checks the buffer length
before doing a memcpy. The previous check is too strict causing valid
sized buffers to be rejected. The length check is incorrect and off by the header size.
Bug:
120665616
Test: Run the SL4A Test for LE CoC, BleCoCTest
Merged-In: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
Change-Id: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
(cherry picked from commit
fcb1994de1f6ee34b8dc6804a2b32e20bf138073)
(cherry picked from commit
1f1d8b97d80d25023c4c7b04d2aa18d367f4158d)
Stanley Tng [Tue, 11 Dec 2018 22:45:13 +0000 (14:45 -0800)]
DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu
Add check to make sure that data buffer is big enough to read the 2
bytes for length.
Also, fix a regression from the previous CL that checks the buffer length
before doing a memcpy. The previous check is too strict causing valid
sized buffers to be rejected. The length check is incorrect and off by the header size.
Bug:
120665616
Test: Run the SL4A Test for LE CoC, BleCoCTest
Merged-In: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
Change-Id: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
(cherry picked from commit
fcb1994de1f6ee34b8dc6804a2b32e20bf138073)
(cherry picked from commit
1f1d8b97d80d25023c4c7b04d2aa18d367f4158d)
(cherry picked from commit
6b2739f309f7719086eb8201b3e1a35ba60035f4)
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:29 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0 skipped:
dff13d810c
Change-Id: I92b4d78f5b6a53c863e7ec6d91b4cc32982258f8
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:28 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0
Change-Id: I0cbec621cadfaaf9142d427b52a17cd9db3cd08a
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:27 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88
Change-Id: I9fd0733ff10442ca2050e440b954a9cb2f574c1a
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:26 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31
Change-Id: I40ce009c5868fde902bc29a0af1b62c89f02f158
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:24 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508
Change-Id: I5812786ed1ac013a273e300c1ddbe3fd26857543
Stanley Tng [Tue, 11 Dec 2018 22:45:13 +0000 (14:45 -0800)]
DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu
Add check to make sure that data buffer is big enough to read the 2
bytes for length.
Also, fix a regression from the previous CL that checks the buffer length
before doing a memcpy. The previous check is too strict causing valid
sized buffers to be rejected. The length check is incorrect and off by the header size.
Bug:
120665616
Test: Run the SL4A Test for LE CoC, BleCoCTest
Merged-In: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
Change-Id: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
(cherry picked from commit
fcb1994de1f6ee34b8dc6804a2b32e20bf138073)
(cherry picked from commit
1f1d8b97d80d25023c4c7b04d2aa18d367f4158d)
(cherry picked from commit
6b2739f309f7719086eb8201b3e1a35ba60035f4)
Jack He [Thu, 3 Jan 2019 18:55:23 +0000 (10:55 -0800)]
Remove BTM_SCO_INCLUDED flag am:
050ef35fde
am:
e83786389b
Change-Id: Ic89d66af8c5a48b6a0b68daec4d9c01df919807a
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