OSDN Git Service
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
Hansong Zhang [Thu, 27 Aug 2020 22:52:47 +0000 (15:52 -0700)]
gap_credits_received_cb is no longer useful
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I38779d4d17ba7c1f403e83a61bb269cd361a7c7f
Hansong Zhang [Thu, 27 Aug 2020 22:51:46 +0000 (15:51 -0700)]
Hearing aid doesn't care about credit received event
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ifc1f7b26c072c36d515ef68dc4a199633ea583e4
Hansong Zhang [Thu, 27 Aug 2020 22:47:51 +0000 (15:47 -0700)]
Remove remaining fixed channel code in bta_jv
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I867225280fb535a8ad9ce2cd6a0318984ede39bf
Hansong Zhang [Thu, 27 Aug 2020 22:39:35 +0000 (15:39 -0700)]
Remove unused fixed channel related stuff
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ibd41658323bfdf0e3ddd7803587e43a7105edc7d
Hansong Zhang [Thu, 27 Aug 2020 22:31:12 +0000 (15:31 -0700)]
Remove unused code
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I85be9ef424d55f31902765e6e47350865b0d2e12
Hansong Zhang [Thu, 27 Aug 2020 22:29:36 +0000 (15:29 -0700)]
sock->fixed_chan is always false
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I410124d0269aae3ed602b4995d0b94a43996e699
Hansong Zhang [Thu, 27 Aug 2020 22:25:31 +0000 (15:25 -0700)]
sock->fixed_chane is always false, and remove unused code
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4e7f5c4a61072535affb5f448fb98096dd1ffa4b
Hansong Zhang [Thu, 27 Aug 2020 22:22:36 +0000 (15:22 -0700)]
bta_jv_l2cap_connect_le is unused
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I8e02427a2fca2ce3482f5673048aa057f7a42fe5
Hansong Zhang [Thu, 27 Aug 2020 22:18:00 +0000 (15:18 -0700)]
Remove l2cap fixed channel socket
The spec says in LE only ATT and SMP use fixed channel, and in classic
only SMP_BR uses fixed channel. Don't expose the socket API to java.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I05e50e53ef9cc3b283cc6c19f74b05cb20b369ce
Hansong Zhang [Wed, 26 Aug 2020 23:20:21 +0000 (16:20 -0700)]
Clean up L2cap usage of btm_int
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Id79da6828e10ccdff25b8c7712a027815542c9ec
Treehugger Robot [Thu, 27 Aug 2020 00:39:25 +0000 (00:39 +0000)]
Merge "Convert gap_connections to new l2cap + security"
Zach Johnson [Wed, 26 Aug 2020 23:19:26 +0000 (16:19 -0700)]
Convert gap_connections to new l2cap + security
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I144bf8dada7ef5e56772d31676911990be135635
Chris Manton [Wed, 26 Aug 2020 22:08:25 +0000 (15:08 -0700)]
Re-include stack/btu/btu_hcif
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I503a60a4bc6693ddd1a4a177eff3e1fd4926d5b3
Chris Manton [Wed, 26 Aug 2020 17:26:45 +0000 (10:26 -0700)]
stack/acl/btm_acl::BTM_GetRole
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6dfd3908bbbfe236457d8b629e02e231b407485e
Chris Manton [Wed, 26 Aug 2020 17:32:26 +0000 (10:32 -0700)]
Streamline stack/acl/btm_acl::BTM_SwitchRole
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5191faa7baca9c2b721acf6e66d16fd330a19c32
Chris Manton [Wed, 26 Aug 2020 17:20:16 +0000 (10:20 -0700)]
Streamline stack/acl/btm_acl::btm_acl_removed
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I54d8f3be856272cc3cfdbde94ab4f46061ff41d6
Chris Manton [Wed, 26 Aug 2020 17:48:48 +0000 (10:48 -0700)]
Re-include stack/btm/btm_ble
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I49257545c67b1521f3415256b9c4cd29ae86d4ab
Treehugger Robot [Wed, 26 Aug 2020 22:55:04 +0000 (22:55 +0000)]
Merge "Make GD LeSecurityTest pass on real devices"
Jakub Pawlowski [Fri, 21 Aug 2020 15:39:11 +0000 (17:39 +0200)]
Make GD LeSecurityTest pass on real devices
This patch contain couple fixes that stabilize LeSecurityTest
When running with --host flag, the virtual execution environment is much
more stable, but on real devices more guarantees around address handling
and disconnection are needed.
Bug:
155399771
Test: cert/run LeSecurityTest
Tag: #gd-refactor
Change-Id: I1f2d7e58600168140009458a2d31509edc19e8c4
Zach Johnson [Wed, 26 Aug 2020 22:07:13 +0000 (22:07 +0000)]
Merge changes I6e42378e,I04ab0633,I97318502
* changes:
Remove BTM_SimpleSetSecurityLevel
Migrate GATT security
Migrate SDP to L2CA_ConnectReq2
Treehugger Robot [Wed, 26 Aug 2020 20:38:25 +0000 (20:38 +0000)]
Merge changes I01baf211,I320b9709,I4045258b,I7d09393f,I7e983860
* changes:
remove def stack/acl/btm_pm::BTM_SSR_INCLUDED
Encapsulate tACL_CB::tACL_CONN::switch_role_state
Enacpsulate tACL_CB::tACL_CONN::encrypt_state
Use API from stack/btu/btu_hcif::l2c_link_role_changed
Slightly Streamline l2c_link_hci_conn_comp
Treehugger Robot [Wed, 26 Aug 2020 20:04:54 +0000 (20:04 +0000)]
Merge "GD-Cert: Add btconfig parameter to real device test"
Treehugger Robot [Wed, 26 Aug 2020 18:32:44 +0000 (18:32 +0000)]
Merge "Fuzzer for g722 encoder"
Chris Manton [Wed, 19 Aug 2020 16:14:59 +0000 (09:14 -0700)]
remove def stack/acl/btm_pm::BTM_SSR_INCLUDED
Because when false untested hence unsupported
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I01baf211d251de2314eff27f5b4065433b14722c
Chris Manton [Sun, 23 Aug 2020 06:26:47 +0000 (23:26 -0700)]
Encapsulate tACL_CB::tACL_CONN::switch_role_state
Towards proper interfaces
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I320b9709a23746e5c7e752214126dafcf158b26a
Chris Manton [Sun, 23 Aug 2020 05:45:02 +0000 (22:45 -0700)]
Enacpsulate tACL_CB::tACL_CONN::encrypt_state
Towards proper interfaces
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4045258b5c2c8cda12c873111e4d8eb22a38475b
Chris Manton [Mon, 17 Aug 2020 23:45:45 +0000 (16:45 -0700)]
Use API from stack/btu/btu_hcif::l2c_link_role_changed
From: stack/btu/btu_hcif
Into: stack/acl/btm_acl
Towards proper interfaces
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7d09393f43a24f7ab3f7197207f52e63af70103c
Chris Manton [Wed, 26 Aug 2020 15:58:37 +0000 (08:58 -0700)]
Slightly Streamline l2c_link_hci_conn_comp
Towards readable code
Bug:
163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7e9838603d8edb00227e7e392424048ac8643adf
Jack He [Wed, 26 Aug 2020 18:11:46 +0000 (11:11 -0700)]
GD-Cert: Add btconfig parameter to real device test
* Pull config from device when done
Bug:
165828962
Test: gd/cert/run
Tag: #gd-refactor
Change-Id: Ic995f5767cdc94ba93d370037b7f1f32b97ceac2
Treehugger Robot [Wed, 26 Aug 2020 17:57:44 +0000 (17:57 +0000)]
Merge "RootCanal: Reset the model in BluetoothHci::close"
Treehugger Robot [Wed, 26 Aug 2020 16:48:43 +0000 (16:48 +0000)]
Merge changes Ic28ba99f,I353efe8c,I2c0908fd,I860b744c,Icc9ad82c
* changes:
Remove bta knowledge of hci handle
Streamline bta/dm/::bta_dm_acl_up/down
Add API stack/acl/btm_acl::acl_peer_supports_sniff_subrating
Remove def bta/dm/BTM_SSR_INCLUDED
Rework api ret val BTA_DmGetConnectionState
Myles Watson [Wed, 26 Aug 2020 14:30:00 +0000 (07:30 -0700)]
RootCanal: Reset the model in BluetoothHci::close
Bug:
166326066
Tag: #stability
Test: com.android.devicehealthchecks
Change-Id: Ia75d07e34a38a74d2f09b6174a387089029e9318
Zach Johnson [Wed, 26 Aug 2020 15:17:10 +0000 (15:17 +0000)]
Merge changes I5b76ec20,I11c768ec,I36a436de,I7b30020b,Ie6b729f1, ...
* changes:
goodbye BTM_SetOutService
Inline BNEP security
Remove more vestiges of PAN GN
Pan role is never GN
Simplify PAN role setting
btpan_enable is never called from JNI
Remove stray out service call
Zach Johnson [Wed, 26 Aug 2020 03:01:48 +0000 (03:01 +0000)]
Merge changes I8edd2a9f,I12ce8b9c,Ida0979e5,Ie814f10f,I2272aadd
* changes:
Correct hidd/h interrupt channel security
Flatten avdt sec_mask
Inline avdt security
Inline HIDH security
inline HIDD security
HsingYuan Lo [Wed, 26 Aug 2020 01:14:08 +0000 (01:14 +0000)]
Merge "Add experimental flag for GATT Robust Caching"
Zach Johnson [Wed, 26 Aug 2020 00:32:58 +0000 (17:32 -0700)]
Remove BTM_SimpleSetSecurityLevel
no longer needed
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6e42378ef8a2c521ef7a5915ddd835342a04018f
Zach Johnson [Wed, 26 Aug 2020 00:31:11 +0000 (17:31 -0700)]
Migrate GATT security
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I04ab063314ebaa13170c7ab76fb900461af19241
Zach Johnson [Wed, 26 Aug 2020 00:28:34 +0000 (17:28 -0700)]
Migrate SDP to L2CA_ConnectReq2
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I973185024689b8d0ffc4b9cb7b5d6e1bb38c09be
Zach Johnson [Wed, 26 Aug 2020 00:25:57 +0000 (17:25 -0700)]
goodbye BTM_SetOutService
you will not be missed
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5b76ec20ee7d0e91bf55e4898d5c722481b8bf81
Zach Johnson [Wed, 26 Aug 2020 00:22:37 +0000 (17:22 -0700)]
Inline BNEP security
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I11c768ec7e281fc4a751bae7a890c93f5144ff81
Zach Johnson [Wed, 26 Aug 2020 00:08:19 +0000 (17:08 -0700)]
Remove more vestiges of PAN GN
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I36a436dea4f3668ee1c393c96c8d5b7b8fbf2bb5
Zach Johnson [Wed, 26 Aug 2020 00:03:23 +0000 (17:03 -0700)]
Pan role is never GN
we only support PANU and NAP
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7b30020bc76d94a2e91fb0b0d9aff2a4e4c99344
Zach Johnson [Tue, 25 Aug 2020 23:52:54 +0000 (16:52 -0700)]
Simplify PAN role setting
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie6b729f15c60891bdc29e84b61c363e770291636