OSDN Git Service
Chris Manton [Sun, 6 Sep 2020 01:36:30 +0000 (01:36 +0000)]
encapsulate tBTM_CB::tBTM_BLE_CB::scan_activity am:
56c6f06d04
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1418800
Change-Id: I40d9ff10a8baf543ebf1a84b233e70888c090b1b
Chris Manton [Thu, 3 Sep 2020 00:25:21 +0000 (17:25 -0700)]
encapsulate tBTM_CB::tBTM_BLE_CB::scan_activity
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I66624e8d0c900b23b1b9e36b655b67c9c8a52155
Chris Manton [Sat, 5 Sep 2020 21:04:36 +0000 (21:04 +0000)]
Remove API constant stack/btm/btm_ble_gap::btm_ble_start_inquiry am:
f5d87ab7cf
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1418799
Change-Id: Ida846b78b66126bbe2c34abe56ab15f62065f795
Chris Manton [Thu, 3 Sep 2020 00:56:56 +0000 (17:56 -0700)]
Remove API constant stack/btm/btm_ble_gap::btm_ble_start_inquiry
First param is a constant from only call junction
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I78b8b602a8d1d207e52903e8e5ba307cabd9119e
Chris Manton [Sat, 5 Sep 2020 01:19:28 +0000 (01:19 +0000)]
Update bta/include/::ble_addr_type am:
1048cf14e6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1418797
Change-Id: Ieda52d2c9b10ce95b2dbeea1237d7e6b0a437bda
Chris Manton [Wed, 2 Sep 2020 04:47:35 +0000 (21:47 -0700)]
Update bta/include/::ble_addr_type
Using strict types tBLE_ADDR_TYPE
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1177d0a1f3054af4ef739d38703ca53a8b5fbf52
Chris Manton [Fri, 4 Sep 2020 18:24:14 +0000 (18:24 +0000)]
Update main/shim/::ble_addr_type am:
0f6f6e0b10
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1418796
Change-Id: I34f0286bb8390e23d44955e16822ce0f6f6e202e
Chris Manton [Wed, 2 Sep 2020 04:45:37 +0000 (21:45 -0700)]
Update main/shim/::ble_addr_type
Using strict types tBLE_ADDR_TYPE
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ieb3b5a50f12317b926a96d6886f431686ef2d37d
Jakub Pawlowski [Fri, 4 Sep 2020 09:04:13 +0000 (09:04 +0000)]
Merge "gatt: Add CID for sending notification confirmation" am:
b20766d1a8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1419293
Change-Id: I44fc83f75a337ce8dfafd60df2497fbb025baac9
Jakub Pawlowski [Fri, 4 Sep 2020 09:03:19 +0000 (09:03 +0000)]
Merge changes from topic "bt-char-ext-prop" am:
d5421f74f4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/710986
Change-Id: Ia66f3381ee94b45b29c7b84bd0e1f5b1e43738c2
Jakub Pawlowski [Fri, 4 Sep 2020 08:41:13 +0000 (08:41 +0000)]
Merge "gatt: Add CID for sending notification confirmation"
Jakub Pawlowski [Fri, 4 Sep 2020 08:38:35 +0000 (08:38 +0000)]
Merge changes from topic "bt-char-ext-prop"
* changes:
Fall back to Read Request when reading Characteristic Extended Properties
Server support for Characteristic Extended Properties
Client support for Characteristic Extended Properties
Treehugger Robot [Fri, 4 Sep 2020 04:57:08 +0000 (04:57 +0000)]
Merge "Shim: Security module InitFlag" am:
4eb05b6173
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1416248
Change-Id: I2a61c23205bf989995987e33ea9dff82af341760
Treehugger Robot [Fri, 4 Sep 2020 04:27:39 +0000 (04:27 +0000)]
Merge "Shim: Security module InitFlag"
Hansong Zhang [Thu, 3 Sep 2020 22:44:22 +0000 (22:44 +0000)]
Shim layer for GD security enforcement am:
1211b69210
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1419609
Change-Id: I233d5d430c676f1b2c13c53df0b874208598bb78
Hansong Zhang [Thu, 3 Sep 2020 20:57:08 +0000 (20:57 +0000)]
Use BTM_GetHCIConnHandle to get handle am:
51cdd36e54
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1418793
Change-Id: Id38c0859a6988c23e911ad10991e97967bbb0ee9
Łukasz Rymanowski [Thu, 3 Sep 2020 14:04:19 +0000 (14:04 +0000)]
gatt: Add CID for sending notification confirmation
This patch fixes a regression after
commit
7a496c86ba675e1023a5b84de686a823834896db
stack/gatt: Extend calls with CID
Notification confirmation was not taken into account.
For notification function attp_send_cl_msg() is called with p_clcb NULL
which leads to a crash in the following line:
uint16_t payload_size = gatt_tcb_get_payload_size_tx(tcb, p_clcb->cid);
This patch introduces a new function: attp_send_cl_confirmation_msg()
which is used only for sending confirmation.
Also this patch makes sure that cid is provided to the GATT client so it
can be used in the confirmation call.
Note: handle was removed from the confirmation call as it is redundant.
The only missing part in this patch is handling timers per each
indication and this will be fixed in following patches which will add
eatt support.
Tag: #feature
Bug:
159786353
Sponsor: jpawlowski@
Test: compile & manual
Change-Id: I8bdb38ec673e11744d670223e5416be01666e1a6
Martin Brabham [Mon, 31 Aug 2020 04:13:43 +0000 (21:13 -0700)]
Shim: Security module InitFlag
Add InitFlags::GdSecurityEnabled()
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Test: Manual testing with hybrid stack
Change-Id: Ic6e164dcd448831a4af4758a13f2c89bf8fd4c27
Hansong Zhang [Thu, 3 Sep 2020 06:34:41 +0000 (23:34 -0700)]
Shim layer for GD security enforcement
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7d284a76a6479ff8ba628e84fa87c76aee07ef11
Hansong Zhang [Wed, 2 Sep 2020 23:50:28 +0000 (16:50 -0700)]
Use BTM_GetHCIConnHandle to get handle
Don't pass handle directly
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I506d420fdcf3253d97f0a04410b66fe3b3fdf46e
Treehugger Robot [Thu, 3 Sep 2020 16:33:48 +0000 (16:33 +0000)]
Merge "HFP: Add more logs to SCO sessions" am:
a96af75bbf
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1416709
Change-Id: I2066553d9a1e5087ea7d15b704fa8df278924d50
Jakub Pawlowski [Thu, 3 Sep 2020 16:32:51 +0000 (16:32 +0000)]
Merge "hci: Support periodic advertising sync + transfer" am:
6a63a1a474
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1305599
Change-Id: I4c1b863e0b786c6d08af683b7c5fbf977fcb0490
Treehugger Robot [Thu, 3 Sep 2020 16:28:43 +0000 (16:28 +0000)]
Merge "HFP: Add more logs to SCO sessions"
Jakub Pawlowski [Thu, 3 Sep 2020 15:52:22 +0000 (15:52 +0000)]
Merge "hci: Support periodic advertising sync + transfer"
Chris Manton [Thu, 3 Sep 2020 15:19:25 +0000 (15:19 +0000)]
shim::Acl should only run if gd::Core disabled am:
47435187e9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1419329
Change-Id: Id8a67631ec49c06ba3a6d15ed1a66fb678b69d84
Jakub Pawlowski [Thu, 28 Jun 2018 15:27:57 +0000 (08:27 -0700)]
Fall back to Read Request when reading Characteristic Extended Properties
If Read Multiple Request is not supported, fall back to Read Request.
Test: Manually tested against device modified to not support Read
Multiple Request (GATT_REQ_READ_MULTI in gatt_server_handle_client_req
forced to return GATT_REQ_NOT_SUPPORTED)
Bug:
110864501
Change-Id: I262678c93f2c3e56832502d1f46542dfc97c7904
Jakub Pawlowski [Wed, 27 Jun 2018 08:59:47 +0000 (01:59 -0700)]
Server support for Characteristic Extended Properties
Test: sl4a GattExtendedPropertiesTest
Bug:
110864501
Change-Id: If04b28f1b90c1f7b5a6f53673f6bd2c4791f28bb
Jakub Pawlowski [Tue, 26 Jun 2018 05:52:33 +0000 (22:52 -0700)]
Client support for Characteristic Extended Properties
Read value of Characteristic Extended Properties descirptors as part of
GATT service discovery process. Also store this value as part of GATT
Cache.
Test: updated GattDatabaseTest.serialize_deserialize_binary_test added
GattCacheTest.stored_attribute_to_binary_characteristic_extended_properties_test
Added sl4a GattExtendedPropertiesTest
Bug:
110864501
Change-Id: Iccd8aa378c14e75f91d761a675c7c23f096ce2da
Jakub Tyszkowski [Tue, 5 May 2020 09:48:29 +0000 (11:48 +0200)]
hci: Support periodic advertising sync + transfer
Bug:
150670922
Tag: #feature
Sponsor: jpawlowski@
Test: compilation
Change-Id: Ic34affd365d2fe873043b754a4a2315077a58092
Chris Manton [Thu, 3 Sep 2020 02:56:22 +0000 (19:56 -0700)]
shim::Acl should only run if gd::Core disabled
Bug:
166280067
Test: compile
Tag: #refactor
Change-Id: I6f79df1b7126d5237d9b2c9bcac3c3a65aaff19c
Treehugger Robot [Thu, 3 Sep 2020 01:45:06 +0000 (01:45 +0000)]
Merge "BTM_API Shim" am:
7120bf9fdc
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1414120
Change-Id: I39e8e772ccc6b3b1c46abd71e33234f7dc914301
Treehugger Robot [Thu, 3 Sep 2020 01:34:27 +0000 (01:34 +0000)]
Merge "BTM_API Shim"
Treehugger Robot [Thu, 3 Sep 2020 00:54:26 +0000 (00:54 +0000)]
Merge "HFP: Add missing sco listen action in state machine" am:
13f4d45e9e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1418791
Change-Id: If928b1dcd139ea913d3dca4492677d66488e0fee
Treehugger Robot [Thu, 3 Sep 2020 00:53:09 +0000 (00:53 +0000)]
Merge "Adds fuzzer for l2cap" am:
5214582599
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1366816
Change-Id: I44325bbf9493eab3979b4a324219bbbc51a66495
Treehugger Robot [Thu, 3 Sep 2020 00:31:55 +0000 (00:31 +0000)]
Merge "HFP: Add missing sco listen action in state machine"
Treehugger Robot [Thu, 3 Sep 2020 00:27:27 +0000 (00:27 +0000)]
Merge "Adds fuzzer for l2cap"
Jack He [Mon, 31 Aug 2020 23:48:06 +0000 (16:48 -0700)]
HFP: Add more logs to SCO sessions
Bug:
159815595
Test: make phone call with HFP
Tag: #refactor
Change-Id: Idcca06da14c1212c28fb1dadd215b4035202b60f
Jack He [Wed, 2 Sep 2020 22:58:19 +0000 (15:58 -0700)]
HFP: Add missing sco listen action in state machine
Bug:
167564040
Bug:
159815595
Tag: #refactor
Test: compile & verify hfp is working
Change-Id: Ife1c3bc68d0f805946e70e172b90bb96abf9fb33
Dylan Katz [Sun, 19 Jul 2020 17:25:44 +0000 (10:25 -0700)]
Adds fuzzer for l2cap
This adds a fuzzer for l2cap and a few related subcomponents.
Test: gd/fuzz/run bluetooth_gd_l2cap_fuzzer
Tag: #feature
Bug:
167425311
Sponsor: zachoverflow@
Signed-off-by: Dylan Katz <dylan.katz@leviathansecurity.com>
Change-Id: I052f103929749b6532c66881cf88589375cf8a5d
Treehugger Robot [Wed, 2 Sep 2020 20:33:44 +0000 (20:33 +0000)]
Merge "BTM_API Shim: Call BTA sp_cback for events" am:
032ada7ee9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1407190
Change-Id: I0c985f002eca7c416ef4c8d651902d05339576b6
Martin Brabham [Thu, 27 Aug 2020 17:28:50 +0000 (10:28 -0700)]
BTM_API Shim
- Add several API implementations
- Connect callbacks to UI
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Test: Manual testing with hybrid stack
Change-Id: Ibe225070223ad1d695ea0226e93ec39ffb1531e8
Treehugger Robot [Wed, 2 Sep 2020 20:19:52 +0000 (20:19 +0000)]
Merge "BTM_API Shim: Call BTA sp_cback for events"
Treehugger Robot [Wed, 2 Sep 2020 20:03:25 +0000 (20:03 +0000)]
Merge changes I4614e05e,I8bfaa30b am:
1a9559b651
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1417850
Change-Id: Iaa865caec55ff949c725087d1866fcddce71d8d8
Jakub Pawlowski [Wed, 2 Sep 2020 20:03:15 +0000 (20:03 +0000)]
Merge changes I5b7c552c,Ie209b705 am:
c476c88184
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1348750
Change-Id: If5b77c818b03864d5ce2218cb5b7b55118e5f67b
Treehugger Robot [Wed, 2 Sep 2020 19:51:20 +0000 (19:51 +0000)]
Merge changes I4614e05e,I8bfaa30b
* changes:
Add a way to enforce l2cap security by requirement
L2cap sec: Remove the workaround for legacy device
Jakub Pawlowski [Wed, 2 Sep 2020 19:28:47 +0000 (19:28 +0000)]
Merge changes I5b7c552c,Ie209b705
* changes:
stack/l2c: Add helper l2cu_reject_ble_coc_connection
stack/gatt: Extend calls with CID
Łukasz Rymanowski [Tue, 5 May 2020 06:48:21 +0000 (08:48 +0200)]
stack/l2c: Add helper l2cu_reject_ble_coc_connection
New helper will take tL2C_CCB* as a parameter (when available).
This will be needed later on when this function will need more more knowledge.
Tag: #feature
Bug:
159786353
Test: compilation
Sponsor: jpawlowski@
Change-Id: I5b7c552c7c1421eaaead70d68ca017341b5363c7
Martin Brabham [Wed, 2 Sep 2020 19:06:12 +0000 (19:06 +0000)]
BTM_API Shim: Implement BTM_ConfirmReqReply am:
cc475e7679
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1407228
Change-Id: I135080c196194892dbe2298838d06b3de4979c44
Treehugger Robot [Wed, 2 Sep 2020 19:06:04 +0000 (19:06 +0000)]
Merge "gd HCI: fix failed assertion about extended_properties" am:
2b18c35326
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1416989
Change-Id: I2d7d77fdcecf2bb50b367462b83a47c17b431f9c
Treehugger Robot [Wed, 2 Sep 2020 19:04:58 +0000 (19:04 +0000)]
Merge "gd HCI: Initialize advertising_handle_ with kInvalidHandle" am:
e7a09e9e22
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1416988
Change-Id: I61d4863d634cffa590f9be46e3c8a0ea9b680c10
Martin Brabham [Fri, 21 Aug 2020 07:03:36 +0000 (00:03 -0700)]
BTM_API Shim: Call BTA sp_cback for events
- IO Capability Request
- IO Capability Response
- User Confirmation Request
Bug:
159815595
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Test: Manual testing with hybrid stack
Change-Id: I30aee8b7c29d6784d62fb5d900fee7bb223aaf10
Martin Brabham [Fri, 21 Aug 2020 06:08:13 +0000 (23:08 -0700)]
BTM_API Shim: Implement BTM_ConfirmReqReply
Bug:
159815595
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Test: Manual testing with hybrid stack
Change-Id: I1f86b0d6ae924e0ea068831cfb27f737df32018d
Treehugger Robot [Wed, 2 Sep 2020 18:35:51 +0000 (18:35 +0000)]
Merge "gd HCI: fix failed assertion about extended_properties"
Treehugger Robot [Wed, 2 Sep 2020 18:35:44 +0000 (18:35 +0000)]
Merge "gd HCI: Initialize advertising_handle_ with kInvalidHandle"
Łukasz Rymanowski [Fri, 1 May 2020 00:40:58 +0000 (02:40 +0200)]
stack/gatt: Extend calls with CID
This is preparation for EATT
Tag: #feature
Bug:
159786353
Sponsor: jpawlowski@
Test: atest net_test_stack
Change-Id: Ie209b705f6cc458286e9566919280ed5e2de60c9
Jakub Pawlowski [Wed, 2 Sep 2020 16:11:29 +0000 (16:11 +0000)]
[automerger skipped] Merge "Fix potential overflow for gatt process write" am:
e3ad294204 -s ours
am skip reason: Change-Id I88704d74ba0c265872fbfd20c8bcd3bc1dd60360 with SHA-1
a6fcdfabeb is in history
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1418568
Change-Id: I71fb8a41fe706e29bda0dbccbc3392798014be83
Jakub Pawlowski [Wed, 2 Sep 2020 15:22:06 +0000 (15:22 +0000)]
Merge "Fix potential overflow for gatt process write"
Chris Manton [Wed, 4 Mar 2020 19:26:31 +0000 (11:26 -0800)]
Fix potential overflow for gatt process write
Bug:
143604331
Test: net_test_stack_gatt_native
Change-Id: I88704d74ba0c265872fbfd20c8bcd3bc1dd60360
Merged-In: I88704d74ba0c265872fbfd20c8bcd3bc1dd60360
Chienyuan [Tue, 1 Sep 2020 12:38:12 +0000 (20:38 +0800)]
gd HCI: fix failed assertion about extended_properties
Bug:
159815595
Tag: #gd-refactor
Test: gd/cert/run --host
Test: manual
Change-Id: Ie910933ed1e9c9619fc0eddd03e41576513ec207
Chienyuan [Tue, 1 Sep 2020 12:12:55 +0000 (20:12 +0800)]
gd HCI: Initialize advertising_handle_ with kInvalidHandle
Bug:
152348535
Tag: #gd-refactor
Test: gd/cert/run --host
Test: atest bluetooth_test_gd
Change-Id: I5254e08f12cc547339f51489dfd06ee2fcd25d57
Treehugger Robot [Wed, 2 Sep 2020 02:47:47 +0000 (02:47 +0000)]
Merge "HFP: Fix missing sco events and masked events" am:
69cf7f99ad
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1417670
Change-Id: I613dcb3800d5bb1167f8106c575bdcdcaae2a76e
Chris Manton [Wed, 2 Sep 2020 02:47:30 +0000 (02:47 +0000)]
First entry acl shim layer am:
edf3cf93d5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1417234
Change-Id: I5403871d9cc4b52ab3f253f94b026e09036122a2
Chris Manton [Wed, 2 Sep 2020 02:47:25 +0000 (02:47 +0000)]
Add main/shim/helpers::ToLegacyAddressWithType am:
6df9d3ed5a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1417233
Change-Id: Ie378da73d6c35c0f340c35708b4f7d5dc6e5b346
Chris Manton [Wed, 2 Sep 2020 02:47:21 +0000 (02:47 +0000)]
Re-include stack/btm/btm_ble_gap am:
4940397977
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1417232
Change-Id: Ia6f230de7b3181af5e6cba0400ddbb5533673f98
Chris Manton [Wed, 2 Sep 2020 02:47:15 +0000 (02:47 +0000)]
Enforce internal linkage stack/btm/btm_ble_bgconn am:
c2518c39ec
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1417231
Change-Id: Iea42cd9070f1ffa01cf6a433ef0cc48f94c959fa
Chris Manton [Wed, 2 Sep 2020 02:47:07 +0000 (02:47 +0000)]
Re-include stack/btm/btm_ble_bgconn am:
cd6b0c5577
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1417230
Change-Id: Iaa11b882b45b61b80b7d9457eca8c6bbb1c13f32
Chris Manton [Wed, 2 Sep 2020 02:47:03 +0000 (02:47 +0000)]
Replace tBTM_SEC_BLE::identity addr/type am:
ff9910468f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1417229
Change-Id: Ie1c73804a7564f6237fcb744531dde55a9529640
Chris Manton [Wed, 2 Sep 2020 02:47:00 +0000 (02:47 +0000)]
Factor out btm_ble_conn_complete::maybe_resolve_address am:
b2d883b53c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1416312
Change-Id: I8a68259e99f3e4b20a10fe3873a8758875cc8151
Chris Manton [Wed, 2 Sep 2020 02:46:56 +0000 (02:46 +0000)]
Use tBTM_SEC_BLE::tADDRESS_TYPE am:
94403d59b3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1416311
Change-Id: Iba2f4222303c81c8b59697700bd883e3d5a2b0af
Chris Manton [Wed, 2 Sep 2020 02:46:34 +0000 (02:46 +0000)]
Simplify return value btm_ble_read_resolving_list_entry am:
3786334414
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1416310
Change-Id: I3af2578199b1598174fcb25aad36887a4e942660
Chris Manton [Wed, 2 Sep 2020 02:45:43 +0000 (02:45 +0000)]
Streamline stack/btm/btm_ble_add::btm_identity_addr_to_random_pseudo am:
d8b2b6c290
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1413995
Change-Id: I2569601e8cdc63f17f0bf44692af7482ae79eca9
Chris Manton [Wed, 2 Sep 2020 02:45:40 +0000 (02:45 +0000)]
Streamline btm_ble_refresh_peer_resolvable_private_addr am:
888eb8af44
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1413992
Change-Id: I1895e6b872624efba324df12dc347e59713c9c85
Chris Manton [Wed, 2 Sep 2020 02:45:36 +0000 (02:45 +0000)]
Encapsulate tBTM_CB::tBTM_BLE_CB::tBTM_BLE_CONN_ST am:
29c1c6afec
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1416209
Change-Id: Iff9c426514a7000bf5ae4fe03fc9b32d9ece8ee1
Treehugger Robot [Wed, 2 Sep 2020 02:37:33 +0000 (02:37 +0000)]
Merge "HFP: Fix missing sco events and masked events"
Chris Manton [Thu, 27 Aug 2020 01:00:33 +0000 (18:00 -0700)]
First entry acl shim layer
Test: atest bluetooth_test_gd
Bug:
166280067
Tag: #refactor
Change-Id: I720045436cd0405b2b9ea1c0e657f8128dffa3a1
Zach Johnson [Wed, 2 Sep 2020 00:17:26 +0000 (17:17 -0700)]
HFP: Fix missing sco events and masked events
* SCO events have secondary actions that need to be handled
* Also remove event masking, which is no longer needed
Bug:
167349211
Bug:
159815595
Tag: #refactor
Test: compile & verify Bluetooth connections are working
Change-Id: If8d3aa873b55b5d6936c16766fd6c1c49749002d
Hansong Zhang [Tue, 1 Sep 2020 23:44:37 +0000 (16:44 -0700)]
Add a way to enforce l2cap security by requirement
Instead of finding the service from psm, and finding the requirement
from the service record, enforce that specific requirement directly
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4614e05ef59e37d466578f4d86122b41a56121cd
Chris Manton [Tue, 1 Sep 2020 17:55:08 +0000 (10:55 -0700)]
Add main/shim/helpers::ToLegacyAddressWithType
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4b53b3438c083abea8b90e8d2548cbbdce517c22
Chris Manton [Tue, 1 Sep 2020 17:03:44 +0000 (10:03 -0700)]
Re-include stack/btm/btm_ble_gap
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I76b33d1552a9dc7d23231d621e5897808109dbb0
Chris Manton [Tue, 1 Sep 2020 16:25:20 +0000 (09:25 -0700)]
Enforce internal linkage stack/btm/btm_ble_bgconn
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7e87665aa40fbd32f1add3120edd17cc2be7f963
Chris Manton [Tue, 1 Sep 2020 16:23:46 +0000 (09:23 -0700)]
Re-include stack/btm/btm_ble_bgconn
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ibbced8fd800006b98e8266bced42b1e5e8034499
Chris Manton [Tue, 1 Sep 2020 04:21:35 +0000 (21:21 -0700)]
Replace tBTM_SEC_BLE::identity addr/type
Replace with address_with_type
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I627c2ce248a394368b47efc077c7b69844b3299e
Chris Manton [Mon, 31 Aug 2020 22:25:23 +0000 (15:25 -0700)]
Factor out btm_ble_conn_complete::maybe_resolve_address
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I910bb35b9eecfd543a4d0b132eef638bdf86040b
Chris Manton [Fri, 28 Aug 2020 00:05:36 +0000 (17:05 -0700)]
Use tBTM_SEC_BLE::tADDRESS_TYPE
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5b67eba668a3bb458bf058da80b2dc08e033bd44
Chris Manton [Mon, 31 Aug 2020 20:00:09 +0000 (13:00 -0700)]
Simplify return value btm_ble_read_resolving_list_entry
Return value too complicated.
Heck, it's not even checked in the single call location
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Id08da2a6f2e16da18c12477b00b112c65ac02543
Chris Manton [Thu, 27 Aug 2020 17:23:29 +0000 (10:23 -0700)]
Streamline stack/btm/btm_ble_add::btm_identity_addr_to_random_pseudo
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I3bb822f62f5c60d5bb54e45d5c38246e9c9612ad
Chris Manton [Thu, 27 Aug 2020 17:05:36 +0000 (10:05 -0700)]
Streamline btm_ble_refresh_peer_resolvable_private_addr
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ib6a617f70803e377ce7dc8fee59c269e26773d3d
Hansong Zhang [Mon, 31 Aug 2020 22:52:20 +0000 (15:52 -0700)]
L2cap sec: Remove the workaround for legacy device
We don't enforce security when we need to open an L2cap channel for a
legacy device (pre 2.1, simple pairing not supported), and let upper
layer enforce security. However, now we always enforce security in
L2cap, except for RFCOMM (which is additional), so there is no other
upper layer can enforce security. Moreover, supporting pre 2.1 devices
(either local or remote) can give us additional complexity, and GD
doesn't support it.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I8bfaa30bb211275aa37122fab991c776a132abcd
Chris Manton [Mon, 31 Aug 2020 16:38:51 +0000 (09:38 -0700)]
Encapsulate tBTM_CB::tBTM_BLE_CB::tBTM_BLE_CONN_ST
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6100f228605af31be29a6ab69d59a57a35b547b0
Treehugger Robot [Tue, 1 Sep 2020 23:01:26 +0000 (23:01 +0000)]
Merge "BTM_API Shim: Add ShimUi" am:
60dd5ef260
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1407227
Change-Id: I44252c702f140625db39e9c0f2fe17c1344da664
Treehugger Robot [Tue, 1 Sep 2020 22:11:15 +0000 (22:11 +0000)]
Merge "BTM_API Shim: Add ShimUi"
Treehugger Robot [Tue, 1 Sep 2020 20:17:38 +0000 (20:17 +0000)]
Merge "BTM_API Shim: Add ShimBondListener" am:
9ed90aaf57
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1406246
Change-Id: I150322cd6e8e45211e11860fa2c205dee58dccc8
Xin Li [Tue, 1 Sep 2020 20:01:30 +0000 (20:01 +0000)]
Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@
6692709)" into stage-aosp-master
Treehugger Robot [Tue, 1 Sep 2020 20:00:30 +0000 (20:00 +0000)]
Merge "BTM_API Shim: Add ShimBondListener"
Treehugger Robot [Tue, 1 Sep 2020 19:51:53 +0000 (19:51 +0000)]
Merge changes I0aa05e5b,I4c2bc679,I2b0a15e8,I8aabfbc4,Ifc8114d9, ... am:
7a7b8e3159
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1416511
Change-Id: Ia3313a9f154146b67d0d1c5ce215721ec4fa7ca6
Treehugger Robot [Tue, 1 Sep 2020 19:10:09 +0000 (19:10 +0000)]
Merge changes I0aa05e5b,I4c2bc679,I2b0a15e8,I8aabfbc4,Ifc8114d9, ...
* changes:
Remove unused code in rfc_int.h
Remove sec_id related code in RFCOMM
Move rfcomm security requirement to rfcomm module
Clear RFCOMM security when done
Get rid of p_cur_service in dev_rec
Legacy RFCOMM: Use the new security record
Introduce BTM_SetRfcommSecurity
Jack He [Tue, 1 Sep 2020 17:04:30 +0000 (17:04 +0000)]
BTM: Fix a bit flip in the role change state comparison am:
cbad6a1531
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1416708
Change-Id: I1c7612e79da342db961238d68460eb5edbc744ef
Xin Li [Tue, 1 Sep 2020 06:46:16 +0000 (23:46 -0700)]
Merge Android R (rvc-dev-plus-aosp-without-vendor@
6692709)
Bug:
166295507
Merged-In: Ife6501268451fd4a1587b7ecea9c41e42d7d6f68
Change-Id: Ie313bc241fafac708a4390ff69a4e8ffe8e2b74f
Jack He [Tue, 1 Sep 2020 00:52:27 +0000 (17:52 -0700)]
BTM: Fix a bit flip in the role change state comparison
Bug:
167151478
Test: make phone calls over Bluetooth
Tag: #stability
Change-Id: I331e2897e23816d5ead2e8bb225e27a48f8d636e
Hansong Zhang [Mon, 31 Aug 2020 22:03:58 +0000 (15:03 -0700)]
Remove unused code in rfc_int.h
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I0aa05e5bdf9fe46f84a5307e1675caf235e2ab10