OSDN Git Service
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 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 [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 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: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 22:11:15 +0000 (22:11 +0000)]
Merge "BTM_API Shim: Add ShimUi"
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: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 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
Hansong Zhang [Mon, 31 Aug 2020 21:56:25 +0000 (14:56 -0700)]
Remove sec_id related code in RFCOMM
That's for BTM security registration. RFCOMM is not using it. So far
only L2cap channel (GAP_ConnOpen) is using dynamic sec_id.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4c2bc679d7f311bb240179866839a9ca86df0c00
Hansong Zhang [Mon, 31 Aug 2020 20:55:43 +0000 (13:55 -0700)]
Move rfcomm security requirement to rfcomm module
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I2b0a15e887da8d3b5e022deaf600a99448976487
Hansong Zhang [Mon, 31 Aug 2020 20:13:31 +0000 (13:13 -0700)]
Clear RFCOMM security when done
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I8aabfbc439dfc30b75d84c247b898d8d910475c1
Hansong Zhang [Mon, 31 Aug 2020 19:44:47 +0000 (12:44 -0700)]
Get rid of p_cur_service in dev_rec
Instead of storing the service for pending security requirements when we
pair a new device, we directly store the security requirement.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ifc8114d952458320f72f422acc9f8b0b9b21bb0d
Martin Brabham [Fri, 21 Aug 2020 05:46:06 +0000 (22:46 -0700)]
BTM_API Shim: Add ShimUi
Create ShimUi class to accept tBTM_APPL_INFO to callback to BTA layer
Bug:
159815595
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Test: Manual testing with hybrid stack
Change-Id: Ifae3a4d72eb919a7468984fbf617c4a6f979c485
Martin Brabham [Fri, 21 Aug 2020 05:08:22 +0000 (22:08 -0700)]
BTM_API Shim: Add ShimBondListener
Create a new class ShimBondListener that accepts the
tBTM_APPL_INFO as a constructor argument.
Bug:
159815595
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Test: Manual testing with hybrid stack
Change-Id: Ifb524cd7af85dba5f5659112437cb5d6284bb8b6
Hansong Zhang [Sun, 30 Aug 2020 22:46:34 +0000 (15:46 -0700)]
Legacy RFCOMM: Use the new security record
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I58138bc628f1749f2c636d41ca759fd7d4fe1121
Hansong Zhang [Sun, 30 Aug 2020 22:29:39 +0000 (15:29 -0700)]
Introduce BTM_SetRfcommSecurity
Store RFCOMM security requirements in a separate map
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6e1737e54506e8744f350c6ba6f75b47c77ea885
Hansong Zhang [Sun, 30 Aug 2020 22:59:18 +0000 (15:59 -0700)]
Remove unused log to improve readability
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1ab7ef85730f6d5c857f12c1bf54db1d17d503d2
Hansong Zhang [Fri, 28 Aug 2020 22:41:45 +0000 (15:41 -0700)]
Only RFCOMM Uses btm_sec_mx_access_request
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I992a5477f71e630531d29c720f51e8473a551eff
Treehugger Robot [Mon, 31 Aug 2020 16:57:00 +0000 (16:57 +0000)]
Merge changes I93466084,I1e1ed49c,Id825a84e
* changes:
Add API stack/l2cap/l2c_ble::l2cble_conn_comp_from_address_with_type
Add API stack/acl/btm_acl::acl_link_role_from_handle
Add btm_identity_addr_to_random_pseudo_from_address_with_type
Zach Johnson [Mon, 31 Aug 2020 15:27:14 +0000 (15:27 +0000)]
Merge changes I5719d43c,Ia756d0fa,Iba08e90a,Ia5d1b195,I678011f4, ...
* changes:
Replace unreadable AG state machine
good riddance AV stream state machine
Replace AV non state machine function table
Replace BTA AV state machine
Flatten bta_hd_sm_execute
Remove unused parameter from bta_hd_vc_unplug_act
Remove unused parameter from bta_hd_disconnect_act
Remove unused parameter from bta_hd_unregister_act
Replace unreadable HD state machine
Replace HH unreadable state machine
BTA_HH_LE_INCLUDED is always true
Remove unreferenced mce file & headers
btif_mce_get_interface is never called
Callbacks are never used
Remove MCE code that now no longer does anything
BTA_MceGetRemoteMasInstances does nothing
bta_mce_get_remote_mas_instances is never referenced
bta_mce_enable is never referenced
bta_mce_sm_execute is never referenced
Remove now unused BTA_MceEnable
btif_mce_execute_service is never called
booleans are a thing for a reason
Simplify BTA_SdpCreate/RemoveRecordByUser
Simplfy BTA_SdpSearch
simplify BTA_SdpEnable
Burninate SDP "state machine"
Chris Manton [Thu, 27 Aug 2020 16:49:14 +0000 (09:49 -0700)]
Add API stack/l2cap/l2c_ble::l2cble_conn_comp_from_address_with_type
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I93466084b186f972fc572d9c076db52fdc23b89c
Chris Manton [Mon, 17 Aug 2020 23:09:35 +0000 (16:09 -0700)]
Add API stack/acl/btm_acl::acl_link_role_from_handle
Bug:
162984360
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1e1ed49c3f0d489c4e087f0520d2626d7d300b94
Chris Manton [Thu, 27 Aug 2020 17:28:39 +0000 (10:28 -0700)]
Add btm_identity_addr_to_random_pseudo_from_address_with_type
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Id825a84e4ffabc0f0d42a97410c0622643bb0516
Chris Manton [Thu, 27 Aug 2020 16:44:19 +0000 (09:44 -0700)]
Add API stack/btm/btm_ble::btm_ble_connected_from_address_with_type
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I829bd8c510a41a2d56faeacb91a4478d4f0e4ce9
Chris Manton [Thu, 27 Aug 2020 04:45:19 +0000 (21:45 -0700)]
Streamline stack/btm/btm_ble::btm_ble_connected
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iad0e19c806b57778cda859f9bf2b45386ab427ed
Chris Manton [Wed, 19 Aug 2020 20:36:54 +0000 (13:36 -0700)]
Add gd acl init flag
Tag: #gd-refactor
Bug:
159815595
Test: cert/run --host
Change-Id: If8344697c48a4a68eeb7606905c1d3b14e3da43a
Treehugger Robot [Mon, 31 Aug 2020 03:49:46 +0000 (03:49 +0000)]
Merge "Remove unnecessary command check"
Chris Manton [Sun, 30 Aug 2020 18:58:51 +0000 (11:58 -0700)]
Remove unnecessary command check
Test fix complements
https://android-review.googlesource.com/c/platform/system/bt/+/
1409768
Bug:
155399771
Test: bluetooth_test_gd
--gtest_filter=LeExtendedAdvertisingManagerTest.create_advertiser_tes
Tag: #gd-refactor
Change-Id: I19f37f82624c4daaeea6a2e8f61fdd92ea442d4a
Zach Johnson [Sun, 30 Aug 2020 17:51:38 +0000 (10:51 -0700)]
Replace unreadable AG state machine
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5719d43ccc8f378766bef82b0af94694c2f1f2f7
Zach Johnson [Sun, 30 Aug 2020 17:14:36 +0000 (10:14 -0700)]
good riddance AV stream state machine
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ia756d0fa09529918b2f9a7638613831989a5d986
Chris Manton [Thu, 27 Aug 2020 18:45:27 +0000 (11:45 -0700)]
Add new api stack/acl/ble_acl::acl_ble__complete
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ia7814ef21e2e06197df8354796318f824f21e19c
Chris Manton [Thu, 27 Aug 2020 00:58:37 +0000 (17:58 -0700)]
Remove unused defs
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ia1f71f374b9d84b819e071e6317eb2fc72576d27
Chris Manton [Thu, 27 Aug 2020 17:08:07 +0000 (10:08 -0700)]
Remove tBT_TRANSPORT from acl_refresh_remote_address
By definition this always requires LE transport
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ia209c486a181700ae687cda99ebd8e3b91443c30
Chris Manton [Sun, 30 Aug 2020 03:47:05 +0000 (20:47 -0700)]
enum-ify tBTM_BLE_CONN_ST
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6abd2e511178562e5bc199e60bcd4b167c601a54
Chris Manton [Thu, 27 Aug 2020 22:33:39 +0000 (15:33 -0700)]
Add helpers to stack/include/bt_types::tBLE_BD_ADDR
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I399924925467f2505836908e331ea24030789f8e
Zach Johnson [Sun, 30 Aug 2020 16:07:51 +0000 (09:07 -0700)]
Replace AV non state machine function table
switch connects the event id to the function itself more closely
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iba08e90a55c7dbde2181ca7fd76277df10688572
Zach Johnson [Sun, 30 Aug 2020 16:00:44 +0000 (09:00 -0700)]
Replace BTA AV state machine
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ia5d1b19565dddf9ac94ceff688b8a74ce245dc67
Zach Johnson [Sat, 29 Aug 2020 17:25:53 +0000 (10:25 -0700)]
Flatten bta_hd_sm_execute
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I678011f408c41ef990a3f3b46f39614f5a57b3ee
Zach Johnson [Sat, 29 Aug 2020 17:19:04 +0000 (10:19 -0700)]
Remove unused parameter from bta_hd_vc_unplug_act
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I291c8d725c06f88273841fa85eb1d7d44a891c24
Zach Johnson [Sat, 29 Aug 2020 17:17:57 +0000 (10:17 -0700)]
Remove unused parameter from bta_hd_disconnect_act
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I34f1b75567f5f76c6acaa11bf78d3550bcde76d0
Zach Johnson [Sat, 29 Aug 2020 17:16:50 +0000 (10:16 -0700)]
Remove unused parameter from bta_hd_unregister_act
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iefae3c72524d7349da92ad63db39129d9202ec2a
Zach Johnson [Sat, 29 Aug 2020 17:12:24 +0000 (10:12 -0700)]
Replace unreadable HD state machine
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I0d8ac9b2b123981fbfa5677f72fc187d8c20c45c
Treehugger Robot [Sat, 29 Aug 2020 04:16:22 +0000 (04:16 +0000)]
Merge "role is unused"
Chris Manton [Thu, 27 Aug 2020 00:53:57 +0000 (17:53 -0700)]
Create stack/include/ble_hci_link_interface
Towards proper interfaces
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I99a8e02fa0f6448245271aa722f92b0943fd6849
Zach Johnson [Sat, 29 Aug 2020 00:37:27 +0000 (17:37 -0700)]
Replace HH unreadable state machine
this is slightly more readable
future patches can simplify this a bit more
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I190fcecca2d7f66c3877e3b4a0ee886d0cf3d721
Zach Johnson [Fri, 28 Aug 2020 23:52:39 +0000 (16:52 -0700)]
BTA_HH_LE_INCLUDED is always true
stop corrupting the code formatting
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I0b5dd0a15c4ab73f2e4a9eb9c01cb3f94b02b2fd
Chris Manton [Fri, 28 Aug 2020 23:34:22 +0000 (16:34 -0700)]
Remove unused defs TRACE_ stack/include/bt_types.h
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I89a528d780f5bc2643a742368ae52a0df5ebd4ed
Chris Manton [Fri, 28 Aug 2020 22:24:00 +0000 (15:24 -0700)]
Move def BLE_ADDR_TYPE_ID_BIT closer to relatives
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ib4f9f1a670b9a029f54eebc97035a33d79539bee
Chris Manton [Fri, 28 Aug 2020 21:40:32 +0000 (14:40 -0700)]
Remove unused defs BLE_ADDR_IS_STATIC
And:
PHY_LE_1M_MASK
PHY_LE_2M_MASK
PHY_LE_CODED_MASK
BLE_ADDR_TYPE_MASK
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1d5f20fb16e4845b5b4150393b467c2d9f683bf5
Chris Manton [Fri, 28 Aug 2020 21:42:50 +0000 (14:42 -0700)]
Use local constant for service/low_energy_client
PHY_LE_1M_MASK
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6bdecd0a24181a62faab53ef64e85347af1215d0
Zach Johnson [Fri, 28 Aug 2020 23:27:22 +0000 (16:27 -0700)]
Remove unreferenced mce file & headers
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5f9a8ff41e9905298fc955c1fcf5fb0018f52760
Zach Johnson [Fri, 28 Aug 2020 23:23:45 +0000 (16:23 -0700)]
btif_mce_get_interface is never called
remove statics that are no longer referenced
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7d09765e225ef25a80dedf24c81a629a7910fe60
Zach Johnson [Fri, 28 Aug 2020 23:18:41 +0000 (16:18 -0700)]
Callbacks are never used
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I3bdc9627d072d27a8b7f911342575f4400abfd97
Zach Johnson [Fri, 28 Aug 2020 23:08:50 +0000 (16:08 -0700)]
Remove MCE code that now no longer does anything
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: If97d3f702f30d957f75dcda9a792deea4696358a
Zach Johnson [Fri, 28 Aug 2020 23:03:29 +0000 (16:03 -0700)]
BTA_MceGetRemoteMasInstances does nothing
the state machine that handles this does not exist
anymore, since it was never actually registered.
delete delete delete
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I2e96eef51205d8ee2c36866cd64a56796266bc64
Zach Johnson [Fri, 28 Aug 2020 22:59:34 +0000 (15:59 -0700)]
bta_mce_get_remote_mas_instances is never referenced
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Id7586339efb0c325aa58d6501147a90a74526bab
Zach Johnson [Fri, 28 Aug 2020 22:57:39 +0000 (15:57 -0700)]
bta_mce_enable is never referenced
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I9c206f21641623395f98d4f556e40cbdf4cb22ce
Zach Johnson [Fri, 28 Aug 2020 22:55:12 +0000 (15:55 -0700)]
bta_mce_sm_execute is never referenced
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Id6488edfe6466de7a9e2ab9d6a40259d5245b121
Zach Johnson [Fri, 28 Aug 2020 22:48:38 +0000 (15:48 -0700)]
Remove now unused BTA_MceEnable
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: If7f46048da5a3eb87a4f8e1dd111a0ec4e44cef9
Hansong Zhang [Fri, 28 Aug 2020 21:14:12 +0000 (14:14 -0700)]
role is unused
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I092c176d244409bb96120a968284709a1fb745c6
Zach Johnson [Fri, 28 Aug 2020 22:41:47 +0000 (15:41 -0700)]
btif_mce_execute_service is never called
also remove orphaned static functions
the compiler complained about
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I15513e28422d66c06745781987054ce61d4f083f
Zach Johnson [Fri, 28 Aug 2020 22:18:43 +0000 (15:18 -0700)]
booleans are a thing for a reason
so don't create an enum that looks like
a boolean and doesn't add any helpful context
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1b43513dd49e1bec17695783cb5e370f306892fc
Zach Johnson [Fri, 28 Aug 2020 22:14:27 +0000 (15:14 -0700)]
Simplify BTA_SdpCreate/RemoveRecordByUser
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I27826c96110cf9c3b533a26275cb7eb22edc1dcf
Zach Johnson [Fri, 28 Aug 2020 22:08:56 +0000 (15:08 -0700)]
Simplfy BTA_SdpSearch
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7b3459a08d98db2f2de3e4beaf94117e0fdb1a1c
Zach Johnson [Fri, 28 Aug 2020 22:01:51 +0000 (15:01 -0700)]
simplify BTA_SdpEnable
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Icda2d2d0a1499c87691481f53b8b5c0008dbb98b
Zach Johnson [Fri, 28 Aug 2020 21:53:06 +0000 (14:53 -0700)]
Burninate SDP "state machine"
yeah it's not a real state machine
first step to cleaning up the object passing
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I78985e8284cd02ce538954c58c8d51945885c23d
Hansong Zhang [Fri, 28 Aug 2020 20:14:15 +0000 (13:14 -0700)]
L2CA_SetIdleTimeout is unused
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iadfc923936e0fcd2f64454d3d989bceb79e5cb6f
Hansong Zhang [Fri, 28 Aug 2020 20:12:26 +0000 (13:12 -0700)]
p_tcb->att_lcid is always L2CAP_ATT_CID
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: If4eacc4c2650188a7952d5bb2387c5d835d1fa4e
Hansong Zhang [Fri, 28 Aug 2020 18:06:55 +0000 (11:06 -0700)]
L2CAP_HIGH_PRI_CHAN_QUOTA_IS_CONFIGURABLE is unused
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I03c91cd0d9b1162eedf87a77451730bab7109883
Hansong Zhang [Fri, 28 Aug 2020 07:20:07 +0000 (00:20 -0700)]
Remove unused code in bta_sys.h
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I83c089521f6e97ac1bc1f985a344f99f9f148043
Hansong Zhang [Fri, 28 Aug 2020 07:08:20 +0000 (00:08 -0700)]
no_smp_on_br is never true
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Idea65ba2ce06532f6739c801136fad1526c7e000
Hansong Zhang [Thu, 27 Aug 2020 23:06:00 +0000 (16:06 -0700)]
Remove unused code in l2c_api.h
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7ab31403b9918c579b5f6a29248da331741644cb
Hansong Zhang [Thu, 27 Aug 2020 23:04:04 +0000 (16:04 -0700)]
p_nocp_cb is never set
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iad8d115f4f84a48b1bbe47edcc84c2fd834dc0c3
Hansong Zhang [Thu, 27 Aug 2020 22:53:42 +0000 (15:53 -0700)]
pL2CA_CreditsReceived_Cb is no longer useful
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ic8085cedcfed0f18bb50853ca19d68983e80f904
OSDN Git Service
