OSDN Git Service
Chris Manton [Sat, 29 Aug 2020 03:48:16 +0000 (03:48 +0000)]
Create stack/include/ble_hci_link_interface am:
648c5bb5a0
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1412076
Change-Id: Iddfaff1f515ab66d4d14e00f8b00b7e3729025d9
Chris Manton [Sat, 29 Aug 2020 01:21:59 +0000 (01:21 +0000)]
Remove unused defs TRACE_ stack/include/bt_types.h am:
debbd630a2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1415351
Change-Id: Ie3cd3241630fe887bc10e6d5be4fff8ffc5a9662
Chris Manton [Sat, 29 Aug 2020 01:21:58 +0000 (01:21 +0000)]
Move def BLE_ADDR_TYPE_ID_BIT closer to relatives am:
649d4bdb52
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1415350
Change-Id: Ib854faadfc544d7b4fb3729fb6e8e66d60c22e60
Chris Manton [Sat, 29 Aug 2020 01:21:56 +0000 (01:21 +0000)]
Remove unused defs BLE_ADDR_IS_STATIC am:
5da8afde4f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1415349
Change-Id: Ief9cf6b81c4d60da8f19f73f6867cac0ea3d2a11
Chris Manton [Sat, 29 Aug 2020 01:21:54 +0000 (01:21 +0000)]
Use local constant for service/low_energy_client am:
d6134ce12e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1415348
Change-Id: I9a5596554f4a6b8f2c58dc0750a25bc1a7ebbb45
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
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
Hansong Zhang [Fri, 28 Aug 2020 22:38:34 +0000 (22:38 +0000)]
L2CA_SetIdleTimeout is unused am:
193df8156d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1415049
Change-Id: Id677f1e5bebde308f823cb6e7db90bc54ad17894
Hansong Zhang [Fri, 28 Aug 2020 22:38:33 +0000 (22:38 +0000)]
p_tcb->att_lcid is always L2CAP_ATT_CID am:
6f879be680
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1415048
Change-Id: I8459ea135df590bdb1fd3fd76daf2f7c90ad5c33
Hansong Zhang [Fri, 28 Aug 2020 21:09:42 +0000 (21:09 +0000)]
L2CAP_HIGH_PRI_CHAN_QUOTA_IS_CONFIGURABLE is unused am:
784c8b32d4
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1414928
Change-Id: I5431f67c6a10f5f90bb9a41ad33f3bba4d18505d
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 17:45:49 +0000 (17:45 +0000)]
Remove unused code in bta_sys.h am:
f56fd33169
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1414295
Change-Id: I623dabf345edd306bbcc5635c6f8f3194be71f08
Hansong Zhang [Fri, 28 Aug 2020 17:45:47 +0000 (17:45 +0000)]
no_smp_on_br is never true am:
b664d7c988
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1414294
Change-Id: I49c996f3461d514a0342b1411ed8dbb063191c2d
Hansong Zhang [Fri, 28 Aug 2020 17:45:44 +0000 (17:45 +0000)]
Remove unused code in l2c_api.h am:
1398ab8eed
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1414293
Change-Id: I8e64b78ad91fcedd04a26d79d3d8ee8fecd3dd22
Hansong Zhang [Fri, 28 Aug 2020 17:45:40 +0000 (17:45 +0000)]
p_nocp_cb is never set am:
1cd1238c69
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1414292
Change-Id: I832da1cabfc563c25404361f995c164493208242
Hansong Zhang [Fri, 28 Aug 2020 12:47:46 +0000 (12:47 +0000)]
pL2CA_CreditsReceived_Cb is no longer useful am:
c666229f40
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1413765
Change-Id: Ic11567265a7965194b076e26ab0648ff6303cf7a
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 [Fri, 28 Aug 2020 07:02:06 +0000 (07:02 +0000)]
gap_credits_received_cb is no longer useful am:
b921e5395d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1413764
Change-Id: I9ea89f0a72a6b2e21313fcb69627e996b4d27af6
Hansong Zhang [Fri, 28 Aug 2020 07:02:05 +0000 (07:02 +0000)]
Hearing aid doesn't care about credit received event am:
181808d214
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1413763
Change-Id: I30aebed508f01234b945429331510bf3f645328a
Hansong Zhang [Fri, 28 Aug 2020 01:11:44 +0000 (01:11 +0000)]
Remove remaining fixed channel code in bta_jv am:
93d587227f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1414370
Change-Id: I99de1d664466a01d929463f2f12393743d74cf28
Hansong Zhang [Fri, 28 Aug 2020 01:11:42 +0000 (01:11 +0000)]
Remove unused fixed channel related stuff am:
6f741834f5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1414369
Change-Id: Iefcc7e9264e689af204330e5248b99048bcd9bb6
Hansong Zhang [Fri, 28 Aug 2020 01:11:25 +0000 (01:11 +0000)]
Remove unused code am:
a43711c3b7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1414368
Change-Id: I57a30ebbc593d21ba523ad75f5a05c524f72b175
Hansong Zhang [Fri, 28 Aug 2020 01:11:23 +0000 (01:11 +0000)]
sock->fixed_chan is always false am:
9e15059b97
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1414127
Change-Id: I64bede5a56336f852b517547f5a97e3f82827358
Hansong Zhang [Fri, 28 Aug 2020 01:11:22 +0000 (01:11 +0000)]
sock->fixed_chane is always false, and remove unused code am:
3d0d241b84
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1414126
Change-Id: I637654a70abaaa8167e897d8865fb60eb9bd6061
Hansong Zhang [Fri, 28 Aug 2020 01:11:20 +0000 (01:11 +0000)]
bta_jv_l2cap_connect_le is unused am:
baa23e13ea
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1414125
Change-Id: Ib3b03bc73533226bb6bffc6127c1cd906b67e147
Hansong Zhang [Fri, 28 Aug 2020 01:11:18 +0000 (01:11 +0000)]
Remove l2cap fixed channel socket am:
8bdc254eea
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1414124
Change-Id: I2081772c332b40ff75ab46446dccceedb5ac4805
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 [Thu, 27 Aug 2020 18:12:16 +0000 (18:12 +0000)]
Clean up L2cap usage of btm_int am:
1ce7f6a706
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1412073
Change-Id: Ic5045fd6c841dd825bdc7cd2d67239fb3debe695
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 01:21:18 +0000 (01:21 +0000)]
Merge "Convert gap_connections to new l2cap + security" am:
d507d94eec
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1412800
Change-Id: I31ee30c7733e38318da1956329048ff731d53dd6
Treehugger Robot [Thu, 27 Aug 2020 00:39:25 +0000 (00:39 +0000)]
Merge "Convert gap_connections to new l2cap + security"
Chris Manton [Wed, 26 Aug 2020 23:48:23 +0000 (23:48 +0000)]
Re-include stack/btu/btu_hcif am:
837c0f41b2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1412799
Change-Id: I36144ce927ff759718db93082a774aafbef503be
Chris Manton [Wed, 26 Aug 2020 23:48:21 +0000 (23:48 +0000)]
stack/acl/btm_acl::BTM_GetRole am:
327890d288
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1412798
Change-Id: I6937a1dc5e8ab69f3781ea5f0c78cdbea350d775
Chris Manton [Wed, 26 Aug 2020 23:48:19 +0000 (23:48 +0000)]
Streamline stack/acl/btm_acl::BTM_SwitchRole am:
c0a05bb168
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1412797
Change-Id: I1c7562022a73cd5aa4f656fd0f22e76244d4ed60
Chris Manton [Wed, 26 Aug 2020 23:48:18 +0000 (23:48 +0000)]
Streamline stack/acl/btm_acl::btm_acl_removed am:
05afd8ae54
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1412796
Change-Id: I086676f28db6816542d0b0ab190fb2bfc9f54d39
Chris Manton [Wed, 26 Aug 2020 23:48:15 +0000 (23:48 +0000)]
Re-include stack/btm/btm_ble am:
78e03b15bd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1412795
Change-Id: I63dedac624af5b292b2fd02fc8216ca2e85c4dc5
Treehugger Robot [Wed, 26 Aug 2020 23:47:58 +0000 (23:47 +0000)]
Merge "Make GD LeSecurityTest pass on real devices" am:
19c2608a3e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1409768
Change-Id: I5251bcfd3aef66896662417c15ce381fe99e8d3c
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"
Zach Johnson [Wed, 26 Aug 2020 22:28:41 +0000 (22:28 +0000)]
Merge changes I6e42378e,I04ab0633,I97318502 am:
2b1adbe7bc
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1411270
Change-Id: I2bd0fa3fa264abd527c9ddb48504ddfe0585b856
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:55:48 +0000 (20:55 +0000)]
Merge changes I01baf211,I320b9709,I4045258b,I7d09393f,I7e983860 am:
f60ecc3d1f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1412290
Change-Id: I69c4be52badce07bc0d977525a1f35d0ab65f3cc
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:26:22 +0000 (20:26 +0000)]
Merge "GD-Cert: Add btconfig parameter to real device test" am:
ef524cc9dc
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1412291
Change-Id: If0326104175380e7e22678a7b9ddb26b2fd13f58
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:34:16 +0000 (18:34 +0000)]
Merge "Fuzzer for g722 encoder" am:
9867ccb142
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1403787
Change-Id: Iaca8abe86e3f64d75ff03270f4501d19840adc45
Treehugger Robot [Wed, 26 Aug 2020 18:34:09 +0000 (18:34 +0000)]
Merge "RootCanal: Reset the model in BluetoothHci::close" am:
e6560ad215
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1411931
Change-Id: I403965d91b4a2196fd256866695830b2105c79ba
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 17:06:06 +0000 (17:06 +0000)]
Merge changes Ic28ba99f,I353efe8c,I2c0908fd,I860b744c,Icc9ad82c am:
d3b5c3b25a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1410836
Change-Id: I027750dbeca097c05adf1223e2e144f32fe0fa19
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:42:25 +0000 (15:42 +0000)]
Merge changes I5b76ec20,I11c768ec,I36a436de,I7b30020b,Ie6b729f1, ... am:
11d2d12d4b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1411267
Change-Id: Ib17c07ea23ce3db5aff4277f3937e903b71da00e
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:53:39 +0000 (03:53 +0000)]
Merge changes I8edd2a9f,I12ce8b9c,Ida0979e5,Ie814f10f,I2272aadd am:
84a2af7dcb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1411167
Change-Id: I683440dba1c40d2ca91b9a9eebdd6c722c062d02
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 02:09:48 +0000 (02:09 +0000)]
Merge "Add experimental flag for GATT Robust Caching" am:
9f4c7667de
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1408167
Change-Id: I2a85a3ac64874fb031e97fc2f8a03312e2711b9d
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:17:51 +0000 (00:17 +0000)]
Add connect request variants that do security am:
f5de1303d2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1410837
Change-Id: Iab7c138c99ec5fe5ab8d7bb8ec17ea35c2ee04be
Zach Johnson [Wed, 26 Aug 2020 00:17:49 +0000 (00:17 +0000)]
Add L2CA_Register2, which does security for you am:
77bf41237d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1410831
Change-Id: Ie446005c34cfd9b023b39c220807c53aff2f8e1c
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
Zach Johnson [Tue, 25 Aug 2020 23:47:43 +0000 (16:47 -0700)]
btpan_enable is never called from JNI
so don't even give it an option to in the future
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I985186ad307690fb1dcb594e569ccb9dbb4aca0a
Zach Johnson [Tue, 25 Aug 2020 22:56:59 +0000 (15:56 -0700)]
Remove stray out service call
Forgotten in other patch
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I825ca53a9c039f80abb822544b8186585180d0da
Zach Johnson [Tue, 25 Aug 2020 22:52:17 +0000 (15:52 -0700)]
Correct hidd/h interrupt channel security
the legacy stack had it as none, but security was implied
since the channels can't exist without the protected channel
up.
Add security for consistency.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I8edd2a9f604c719876c1b64388041f4c7d94ce6c