OSDN Git Service
Jakub Pawlowski [Fri, 2 Oct 2020 06:41:13 +0000 (06:41 +0000)]
Merge "Store LE device keys when bonded"
Treehugger Robot [Fri, 2 Oct 2020 02:00:35 +0000 (02:00 +0000)]
Merge "HIDH: Register for HID_PSM_CONTROL"
Treehugger Robot [Thu, 1 Oct 2020 23:19:19 +0000 (23:19 +0000)]
Merge "Revert "Add ACL shim event registration""
Myles Watson [Thu, 1 Oct 2020 22:49:41 +0000 (15:49 -0700)]
HIDH: Register for HID_PSM_CONTROL
Bug:
169780397
Test: Pair with a classic HID device
Tag: #gd-refactor
Change-Id: I22fa725c2665282b2c246256c838fdbc8bc05549
Chris Manton [Thu, 1 Oct 2020 17:48:30 +0000 (10:48 -0700)]
Revert "Add ACL shim event registration"
Test: Compiles
Bug:
166280067
Tag: #refactor
This reverts commit
a6b323be6e84c6fb0e986b73a8555314044618ab.
Change-Id: I99b4f8b8fa7118cd2754477209b8e81916cb4811
Hansong Zhang [Thu, 1 Oct 2020 06:41:01 +0000 (23:41 -0700)]
L2cap user dynamic channel: move psm alloc to bta
Only used by bta_jv. No need to have a L2cap-level psm allocation.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: If445b392d1ca67a5a94c5cc180566d31c1dcf698
Hansong Zhang [Thu, 1 Oct 2020 06:20:11 +0000 (23:20 -0700)]
Clean up unused avdt definitions
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iac74f0262f77d4a9dd040f767f0b54151c089376
Treehugger Robot [Thu, 1 Oct 2020 18:24:37 +0000 (18:24 +0000)]
Merge changes from topic "gd_security_shim"
* changes:
BTM Shim: Put/Get information bits to ConfirmationData
Introduce ConfirmationData
Martin Brabham [Mon, 21 Sep 2020 17:12:30 +0000 (10:12 -0700)]
BTM Shim: Put/Get information bits to ConfirmationData
We need the io_caps, auth_reqs, and oob present to send to BTA.
We won't need this when the shim goes away, but for now its necessary.
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Change-Id: I3f3a2ba909ed4384ca44ad2ddca5b5ecda64822e
Martin Brabham [Thu, 17 Sep 2020 19:50:18 +0000 (12:50 -0700)]
Introduce ConfirmationData
ConfirmationData is an object to contain information
for passing to the UI via Display* functions defined
in the class Ui.
This consolidates the required function signature from 2-3 arguments
down to a single argument. Additionally, we gain a feature
for putting and getting extra data. This extra data mechanism
will allow for the SecurityModule to pass information to the shim
such as:
- IO Capability
- Authentication Requirements
- MITM bit
It is required that we map these in the shim and pass them back to
BTA in order to drive the BTA state machine properly.
BYPASS_INCLUSIVE_LANGUAGE_REASON="following bluetooth specification terms"
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: I30b19fb5a3d5fa3462cf4fdc5f47df5d5bb4c478
Hansong Zhang [Wed, 30 Sep 2020 23:54:55 +0000 (16:54 -0700)]
BTA_AV: Unused variables
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I9aa90fdb30e91cb61d4db4596d5f68743540d225
Hansong Zhang [Wed, 30 Sep 2020 23:33:21 +0000 (16:33 -0700)]
L2CA_SetFlushTimeout does nothing.
Since LinkFlushTimeout is always 0 and we always set it to 0.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ia6a87f45f59b4bb429aba98f921785b3e9e0d309
Hansong Zhang [Wed, 30 Sep 2020 23:30:40 +0000 (16:30 -0700)]
L2cap: clean up flush timeout option
Seems that only one value is used.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6da78ec6108cb34316199fb16b52bacee6bf74a1
Hansong Zhang [Wed, 30 Sep 2020 23:29:20 +0000 (16:29 -0700)]
BTA_AV: Unused variable
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I0fbf4c28f24bd61aa500dc00f9da51dd5bc2234e
Hansong Zhang [Wed, 30 Sep 2020 23:24:09 +0000 (16:24 -0700)]
BTA_AV: Simplify flush timeout parameter
Always 0.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ibd66605d65a421386b2b48766808b5be3f3c8e4e
Hansong Zhang [Wed, 30 Sep 2020 23:16:29 +0000 (16:16 -0700)]
L2cap: our cfg option never uses flush timeout
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1fe3a1192bf70d590926e7702aadb57722835a85
Treehugger Robot [Thu, 1 Oct 2020 03:06:17 +0000 (03:06 +0000)]
Merge "Use bta/sys/bta_sys::BtaIdSysText()"
Chris Manton [Wed, 30 Sep 2020 22:46:41 +0000 (15:46 -0700)]
Incoming ACL packets stop at acl layer first
Bug:
166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Icbc0193a0db19c05f1edd5d4c3ea168819bae17b
Chris Manton [Fri, 4 Sep 2020 01:37:35 +0000 (18:37 -0700)]
Re-log bta/../LOG_
Towards readable logs
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: If2da96e529d07baa0e3f74d384833ce19d25b33a
Chris Manton [Thu, 24 Sep 2020 06:11:42 +0000 (23:11 -0700)]
Use bta/sys/bta_sys::BtaIdSysText()
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I149985efc21bdad7b5039085226194c80877485f
Treehugger Robot [Wed, 30 Sep 2020 22:53:40 +0000 (22:53 +0000)]
Merge "Add ACL shim event registration"
Treehugger Robot [Wed, 30 Sep 2020 22:15:48 +0000 (22:15 +0000)]
Merge changes I2f2c69a4,I41a65c6c,I101aa769,I87d34f49,Ifb5e07f6, ...
* changes:
Remove unnecessary declarations stack/btm/btm_sco
Locally link and remove unused funcs stack/btm/btm_sco
Re-log stack/btm/btm_ble_gap::btm_ble_update_inq_result
Remove duplicate decls stack/btm/btm_int
Locally link and remove unused funcs stack/btm/btm_inq
Remove decl stack/btm/btm_int
Locally link and remove unused funcs stack/btm/btm_devctl
Locally link and remove unused funcs stack/btm/btm_ble_cont_energy
Locally link and remove unused funcs stack/btm/btm_ble_adv_filter
Locally link and remove unused funcs stack/btm/btm_ble_addr
Remove unnecessary declarations stack/btm/btm_ble_int
Remove duplicate decls
Add bta/sys/bta_sys::BtaIdSysText()
Re-log parts of btif/src/btif_storage
Re-log parts of btif/src/btif_sock_thread
Re-log btif/src/btif_sock_rfc::btsock_rfc_listen
Chris Manton [Mon, 28 Sep 2020 20:15:06 +0000 (13:15 -0700)]
Add ACL shim event registration
Bug:
166280067
Tag: #refactor
Test: gd/cert/run --host
Test: ble paired 2 phones
Test: act.py -tc BleCocTest
Change-Id: Ie5c1fcf271c8af2d7e8ef32f43e87672c47d536b
Sal Savage [Wed, 30 Sep 2020 20:06:18 +0000 (20:06 +0000)]
Merge "Properly update config when the MAC Address changes"
Chris Manton [Sun, 20 Sep 2020 02:41:02 +0000 (19:41 -0700)]
Remove unnecessary declarations stack/btm/btm_sco
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I2f2c69a445738420f0a316a1e4c36a879f6ce516
Chris Manton [Wed, 30 Sep 2020 16:43:20 +0000 (09:43 -0700)]
Locally link and remove unused funcs stack/btm/btm_sco
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I41a65c6c12648868c804b1783558bb4aa1b96aed
Chris Manton [Sat, 26 Sep 2020 23:24:26 +0000 (16:24 -0700)]
Re-log stack/btm/btm_ble_gap::btm_ble_update_inq_result
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I101aa7696dbb42661753cf6cd08f3c1dca5c4c6f
Chris Manton [Sun, 20 Sep 2020 02:42:01 +0000 (19:42 -0700)]
Remove duplicate decls stack/btm/btm_int
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I87d34f49bc6a325d6dcc6ada7ac125fedd9cd9b3
Chris Manton [Sun, 20 Sep 2020 02:40:37 +0000 (19:40 -0700)]
Locally link and remove unused funcs stack/btm/btm_inq
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Ifb5e07f6ed4c34af4fb06765d9db53ef802ad24b
Chris Manton [Sun, 20 Sep 2020 02:28:26 +0000 (19:28 -0700)]
Remove decl stack/btm/btm_int
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Ie3915f1024cd82063534b9898fc60fa3eb776f10
Chris Manton [Sun, 20 Sep 2020 02:27:54 +0000 (19:27 -0700)]
Locally link and remove unused funcs stack/btm/btm_devctl
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I1eda2d00df6b05437fdd1d5a9cb331f53d3a94fd
Chris Manton [Sun, 20 Sep 2020 02:27:12 +0000 (19:27 -0700)]
Locally link and remove unused funcs stack/btm/btm_ble_cont_energy
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I7df768d8a8e953fed7478e527b97412511d2252f
Chris Manton [Sun, 20 Sep 2020 01:46:52 +0000 (18:46 -0700)]
Locally link and remove unused funcs stack/btm/btm_ble_adv_filter
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I3d9da417cd70567e0f985c34500098827c4e842d
Chris Manton [Sun, 20 Sep 2020 01:45:52 +0000 (18:45 -0700)]
Locally link and remove unused funcs stack/btm/btm_ble_addr
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I38adcdc582a3330e2fab95310e5e706fa40e8c0d
Chris Manton [Sun, 20 Sep 2020 01:33:06 +0000 (18:33 -0700)]
Remove unnecessary declarations stack/btm/btm_ble_int
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I53c769dff909d282c57e558f69086fe4fa670e35
Chris Manton [Sun, 20 Sep 2020 01:11:32 +0000 (18:11 -0700)]
Remove duplicate decls
Also in: stack/btm/btm_ble_int
Towards readable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Id033e59c15e26fbba35294a2a148296f0f69e790
Chris Manton [Thu, 24 Sep 2020 06:11:30 +0000 (23:11 -0700)]
Add bta/sys/bta_sys::BtaIdSysText()
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Ie2bde0d4b46e3721d8523fa9293ddbc97e4e1fd2
Chris Manton [Thu, 24 Sep 2020 18:18:41 +0000 (11:18 -0700)]
Re-log parts of btif/src/btif_storage
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I2d2a3a44037a132f2361acb36d039e9d8c757c8d
Chris Manton [Thu, 24 Sep 2020 18:17:57 +0000 (11:17 -0700)]
Re-log parts of btif/src/btif_sock_thread
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I455eba51f92a8185997fefc88fad4bfffc36cd0e
Chris Manton [Thu, 24 Sep 2020 18:16:55 +0000 (11:16 -0700)]
Re-log btif/src/btif_sock_rfc::btsock_rfc_listen
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ie7839827710efa59e6181fd34cc7d1e4a3aad3cd
Martin Brabham [Tue, 29 Sep 2020 23:34:05 +0000 (16:34 -0700)]
CertSecurity: Add missing events to registration
Bug:
169707911
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: Id28bcad19a0ee58e5127b47f52a6935d96bd6c67
Jakub Pawlowski [Wed, 30 Sep 2020 17:21:38 +0000 (19:21 +0200)]
Store LE device keys when bonded
Bug:
142341141
Tag: #gd-refactor
Test: Pair LE device with phone, confirm that keys are in storage
Change-Id: Ia69b10dac9516d460faa26f2aae769fcfbae8780
Chris Manton [Wed, 30 Sep 2020 04:26:24 +0000 (21:26 -0700)]
L2cap CoC callback use Confirm not Ind on server
Confirm is nullptr on L2cap connect-only-services
Bug:
169725013
Test: act.py -tc BleCocTest
Tag: #refactor
Change-Id: I5c87923a2b721c3d5b87d52969552382a5b1d633
Dan Shi [Tue, 29 Sep 2020 23:31:48 +0000 (16:31 -0700)]
Remove net_test_bta from TEST_MAPPING file
The test is device only test.
Bug:
169705178
Test: none
Change-Id: I19b6fdf5ff5e197380f5406563903f685e7a3d78
Sal Savage [Tue, 29 Sep 2020 19:01:45 +0000 (12:01 -0700)]
Properly update config when the MAC Address changes
The existing code has two issues:
- We pass a 0 size value for the buffer we intend to contain the value
we're getting. This causes btif_config_get_str to always return
positively but never write a value because its usage of srtlcpy doesn't
think it has space to write.
- We check to see if the address in the config is the same as the one
received from the controller using (strcmp(...) == 0). However, strcmp
returns 0 if they are the same. It will be a non-zero value if they are
different.
Following this change, the bt_config.conf file should have the correct
value for the MAC Address in the case the controller interface starts
reporting something new.
Bug:
169686820
Test: setprop persist.vendor.service.bdroid.bdaddr <something new>; cat
/data/misc/bluedroid/bt_config.conf | grep Address;
Change-Id: I6cdb70776fef689426baf58be0ccaf4abe9c9023
Treehugger Robot [Tue, 29 Sep 2020 18:46:09 +0000 (18:46 +0000)]
Merge changes Iefb88b7e,Ia8fd678c,Ieefd35fa,Ib474f0be,I16606384, ...
* changes:
Re-log btif/src/btif_dm::btif_dm_cancel_discovery
Re-log btif/src/btif_dm::btif_dm_search_services_evt
Re-log btif/src/btif_dm::btif_update_remote_properties
Re-log btif/src/btif_dm::bond_state_changed
Re-log btif/src/btif_core::btif_enable_bluetooth_evt
Re-log btif_get____type
Log proper btif/src/btif_bqr::ConfigureBqr
Re-log btif/src/btif_av::btif_av_get_peer_sep
Re-log btif/src/btif_a2dp::btif_a2dp_on_idle
Restore Le transport for SetPhy function
Treehugger Robot [Tue, 29 Sep 2020 17:31:58 +0000 (17:31 +0000)]
Merge "Reject SetBrowsedPlayer if there is not browsable player"
Hansong Zhang [Tue, 29 Sep 2020 04:56:13 +0000 (21:56 -0700)]
L2cap shim: Add mtu requirement to config option
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ib0da747b905df5edfc1f03518a565f1ed914a148
Alain Vongsouvanh [Tue, 29 Sep 2020 17:00:02 +0000 (17:00 +0000)]
Merge "GAP: Support 128-bit custom UUID in EIR record"
Chris Manton [Thu, 24 Sep 2020 18:11:17 +0000 (11:11 -0700)]
Re-log btif/src/btif_dm::btif_dm_cancel_discovery
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Iefb88b7ec327e34ab37efa95b85c348b237928a3
Chris Manton [Thu, 24 Sep 2020 18:10:07 +0000 (11:10 -0700)]
Re-log btif/src/btif_dm::btif_dm_search_services_evt
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ia8fd678c45b26606b913bfcea632fc570f56d127
Chris Manton [Thu, 24 Sep 2020 18:06:29 +0000 (11:06 -0700)]
Re-log btif/src/btif_dm::btif_update_remote_properties
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ieefd35faee11881a178000e755d2d7fa575f8632
Chris Manton [Thu, 24 Sep 2020 18:03:05 +0000 (11:03 -0700)]
Re-log btif/src/btif_dm::bond_state_changed
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ib474f0be03be451c3a5c14242c1fb9c4c8e97d3c
Chris Manton [Thu, 24 Sep 2020 18:01:59 +0000 (11:01 -0700)]
Re-log btif/src/btif_core::btif_enable_bluetooth_evt
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I16606384fa2580fe372aa852cc4b7f0f606cd484
Chris Manton [Thu, 24 Sep 2020 17:58:38 +0000 (10:58 -0700)]
Re-log btif_get____type
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ie3d53b527b0938dc76763d5106afe5deb02601cc
Chris Manton [Thu, 24 Sep 2020 17:57:39 +0000 (10:57 -0700)]
Log proper btif/src/btif_bqr::ConfigureBqr
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I56d3b55cbf6eee6b55cfa66f718451dae3aee1db
Chris Manton [Thu, 24 Sep 2020 17:56:31 +0000 (10:56 -0700)]
Re-log btif/src/btif_av::btif_av_get_peer_sep
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ieac7e5a6c0545a9de9296b4b6081e86cf0c986a7
Chris Manton [Thu, 24 Sep 2020 17:54:11 +0000 (10:54 -0700)]
Re-log btif/src/btif_a2dp::btif_a2dp_on_idle
Towards loggable code
Bug:
163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I4e2ed9eb46823b70d0c7d066c1df555ef8483742
Chris Manton [Fri, 25 Sep 2020 19:53:32 +0000 (12:53 -0700)]
Restore Le transport for SetPhy function
Bug:
163134718
Tag: #refactor
Test: ble paired 2 phones
Test: act.py -tc BleCocTest
Change-Id: I5952932176fdd1392142eb3a3df9e2f4f0e94dab
Hansong Zhang [Mon, 28 Sep 2020 23:11:45 +0000 (16:11 -0700)]
GD L2cap: Add a way to enforce required mtu
Test: cert/run --host
Tag: #gd-refactor
Bug:
141555841
Change-Id: Iefe65f3105ced94a9e653d82a59e550687765df2
Hansong Zhang [Mon, 28 Sep 2020 22:38:47 +0000 (15:38 -0700)]
GAP_ConnOpen code minor clean up
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I0ecb38538aae423a1232676004a3a7b85d628bcd
Hansong Zhang [Mon, 28 Sep 2020 20:15:10 +0000 (13:15 -0700)]
LE COC: Indicate channel open on ConnectRsp recv
Also don't auto send ConnectRsp for LE. Need to clean up config.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4e148d0d0d6597ef8d1d9115db8c8ba6f92a1b8e
Treehugger Robot [Tue, 29 Sep 2020 00:49:15 +0000 (00:49 +0000)]
Merge "Call EXPECT_CALL before the incoming event"
Treehugger Robot [Tue, 29 Sep 2020 00:00:20 +0000 (00:00 +0000)]
Merge "SM: Implement name request during Classic pairing"
Martin Brabham [Mon, 28 Sep 2020 22:52:55 +0000 (15:52 -0700)]
Call EXPECT_CALL before the incoming event
Bug:
169598507
Tag: #stability
Test: atest --host bluetooth_test_gd
Change-Id: If58fa04c6c292c197959b14e29f52800fd14c03b
Martin Brabham [Fri, 4 Sep 2020 05:03:32 +0000 (22:03 -0700)]
SM: Implement name request during Classic pairing
Ensure we try to receive the name and wait for it before
we show the UserConfirmation Dialog.
Bug:
162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Change-Id: I6a4401873770f7f642e06da34002dba55e5f049e
Hansong Zhang [Mon, 28 Sep 2020 20:00:18 +0000 (13:00 -0700)]
L2CAP: Remove unused ConnectRsp
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ifa6fc5470aeda670eb51482ed91a2b7ab665a813
Hansong Zhang [Mon, 28 Sep 2020 19:40:00 +0000 (12:40 -0700)]
RFCOMM, AVDT, HID: L2cap signal id is not used
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I53b2236b8603b4d8a3c6a49f8ae1355020a657e5
Hansong Zhang [Mon, 28 Sep 2020 19:20:19 +0000 (12:20 -0700)]
Include initial remote config in pL2CA_ConfigCfm_Cb
So we don't need to send a separate pL2CA_ConfigInd_Cb.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I75dafa4bc38a1c5a7773db6be5665b30ad88b006
Hansong Zhang [Mon, 28 Sep 2020 06:59:00 +0000 (23:59 -0700)]
Serialize L2CAP connect ind/cfm, config ind, cfm
Make them happen at one place.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie6b073312f77d837009783dcdbbf6835dfe71985
Hansong Zhang [Sun, 27 Sep 2020 23:49:17 +0000 (16:49 -0700)]
L2cap: Auto send ConnectRsp
In the past, L2cap user can decide whether to accept or reject a
ConnectReq. If reject, the channel is closed.
Now let L2cap layer always auto accept the remote ConnectReq and start
config process. If the L2cap user wants to reject, they can send a
DisconnectReq. According to L2cap state machine, a DisconnectReq after
ConnectRsp terminates the channel, which is equivalent to sending a
negative ConnectRsp, as before.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ibed56206148922356e8d9cb10650e9d82ab61225
Hansong Zhang [Sun, 27 Sep 2020 23:30:03 +0000 (16:30 -0700)]
Check for control block nullptr on l2cap error
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie041822b2f51aa20e57fa35f90c432a6c96733d5
Hansong Zhang [Sun, 27 Sep 2020 23:12:43 +0000 (16:12 -0700)]
L2cap channel cb: Store who initiated dynamic channel
Use pL2CA_ConfigCfm_Cb to let user know the direction.
Later the user can run check in ConnectInd or ConnectCfm callback.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iae663e6bea0fc9426c5dfbbfc52bd1ae848f2965
Hansong Zhang [Sun, 27 Sep 2020 22:53:12 +0000 (15:53 -0700)]
We always send pL2CA_ConfigCfm_Cb with status OK
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4865330b4c48fe507bd6df72a5e362a616744ef4
Hansong Zhang [Sun, 27 Sep 2020 22:18:57 +0000 (15:18 -0700)]
L2cap shim clean up
Now we send ConfigReq and ConfigRsp automatically, we need to send
callbacks automatically.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I34e9a8afef63fed21befeda5c3a66e425d6ffaf8
Hansong Zhang [Sun, 27 Sep 2020 21:23:20 +0000 (14:23 -0700)]
L2CAP_FLUSHABLE_PKT is never used
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I21ef421c0fcc0f85ab4497fb4ff47bd83a242673
Ted Wang [Thu, 24 Sep 2020 11:24:24 +0000 (19:24 +0800)]
Reject SetBrowsedPlayer if there is not browsable player
Tag: #compatibility
Bug:
163109635
Test: atest net_test_avrcp
Change-Id: I587ca0d514b50c7a72269eef86a8b5ff38343d05
Hansong Zhang [Sun, 27 Sep 2020 07:24:48 +0000 (00:24 -0700)]
Minor clean up in l2c_api
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4e7f7d610dba175c9d0abc3d23038891acf31242
Hansong Zhang [Sun, 27 Sep 2020 07:12:49 +0000 (00:12 -0700)]
L2cap: Simplify DisconnectRsp
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working & OPP
Change-Id: I3c4c18bc6d55fe3aa8acda4db8d72f97781729ec
Hansong Zhang [Sun, 27 Sep 2020 07:03:53 +0000 (00:03 -0700)]
Remove unused L2cap code
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working & OPP
Change-Id: I3fce28b929e0d8685656b64725d8d36e37a082b4
Hansong Zhang [Sun, 27 Sep 2020 00:59:51 +0000 (17:59 -0700)]
Simplify avdt_sec_check_complete_term
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iabddefde41cc2f63b306efe0cd4eb7e59116141b
Hansong Zhang [Sun, 27 Sep 2020 00:42:02 +0000 (17:42 -0700)]
Simplify bnep_sec_check_complete
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ifc0edea758f4d1e0847f5b00fc49b51b4ad00344
Hansong Zhang [Sat, 26 Sep 2020 23:58:47 +0000 (16:58 -0700)]
l2c_csm: Use pL2CA_Error_Cb on error
Note that we only have two result codes, because the user only needs to
know whether it's during ConnectRsp or ConfigRsp (except for HIDH
retry), which we need further research.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I24aa7bf8487c9b2b69fc455cfdb52a7ec758b90b
Hansong Zhang [Sat, 26 Sep 2020 23:48:40 +0000 (16:48 -0700)]
Regard L2CAP_CFG_PENDING as failure
Since all L2CAP users disconnect if the status is not OK.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I112400c2081be12d038426c1e8ea82229d5b9f4a
Hansong Zhang [Sat, 26 Sep 2020 23:39:28 +0000 (16:39 -0700)]
Introduce pL2CA_Error_Cb
L2CAP notifies users error in ConnectRsp and ConfigRsp through this
callback function (not linked so far). Next step is we send success
through pL2CA_ConnectCfm_Cb and pL2CA_ConfigCfm_Cb.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I4456487d36248408fc1c31403d107baef05e3646
Hansong Zhang [Sat, 26 Sep 2020 23:20:31 +0000 (16:20 -0700)]
l2c_csm: Remove unused variable
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie11caa34cc55ed7e4aa6789df4cf08725998c73a
Treehugger Robot [Mon, 28 Sep 2020 02:28:06 +0000 (02:28 +0000)]
Merge "Add missing runtime dependency of android.hardware.bluetooth@1.1-service.btlinux"
Treehugger Robot [Mon, 28 Sep 2020 00:05:12 +0000 (00:05 +0000)]
Merge "Set apex_available property"
Hansong Zhang [Sun, 27 Sep 2020 06:38:13 +0000 (23:38 -0700)]
L2CAP ERTM: Fix p_ccb->max_rx_mtu
Use the old value, which was removed in
I78c3d65fdaf14addf80607ce5105221e52447a9e.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working & OPP
Change-Id: I90a8f94d16f87df2d4ce8bb0de8130d544affd12
Hansong Zhang [Sat, 26 Sep 2020 06:06:13 +0000 (23:06 -0700)]
Use hidh_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I098743c83c82445618d02c2d8491890d8f765fee
Hansong Zhang [Sat, 26 Sep 2020 06:18:33 +0000 (23:18 -0700)]
Use hidd_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I96bb727b01b8f0114d9f0cba1b8068e9591fae1f
Hansong Zhang [Sat, 26 Sep 2020 06:04:26 +0000 (23:04 -0700)]
HID: Simplify security check code
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ief3f87adbe41c1d4c5ea848fcddc3d1a3352166b
Hansong Zhang [Sat, 26 Sep 2020 06:30:27 +0000 (23:30 -0700)]
Use rfc_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I32a6be12ab14a27c9c0502961bf5bd9bdbdff005
Hansong Zhang [Sat, 26 Sep 2020 00:40:04 +0000 (17:40 -0700)]
Use avct_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6e35a51a175b43d9b0dc5bb5be859e2d5ff94fa1
Hansong Zhang [Sat, 26 Sep 2020 00:35:36 +0000 (17:35 -0700)]
Use avdt_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I03f15d69e86d12b53fa4ee7fc711d4dca8a294aa
Hansong Zhang [Sat, 26 Sep 2020 00:12:47 +0000 (17:12 -0700)]
Use avct_br_on_l2cap_error
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I40fb1d61ff9375d0da2e1f4c83d42d5b273699c4
Tianyu Jiang [Fri, 25 Sep 2020 22:36:20 +0000 (15:36 -0700)]
Add missing runtime dependency of android.hardware.bluetooth@1.1-service.btlinux
so that hwasan build succeeds.
Test: lunch aosp_??????-userdebug && m SANITIZE_TARGET=hwaddress -j36
Bug:
169083233
Change-Id: I78da891664c2667aa449969b6f06f030e624b2e7
(cherry picked from commit
7181fb9f9e6823e06e718de5727f123b4073e05e)
Hansong Zhang [Sat, 26 Sep 2020 00:03:33 +0000 (17:03 -0700)]
Use gap_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I8faaa5f586e3133d1a5c7ff890ad27a87ee9433a
Hansong Zhang [Fri, 25 Sep 2020 23:54:05 +0000 (16:54 -0700)]
Use gatt_on_l2cap_error for error handling
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I7a2fbc5805662270588d152ead932ffa02fc9dc6
Hansong Zhang [Fri, 25 Sep 2020 23:37:51 +0000 (16:37 -0700)]
Simplify bnep_on_l2cap_error
Both cases are doing the same thing.
Error reason isn't used throughout the stack.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ib3793f96c0d8a2907fc41d9a24712d2db78a0665
OSDN Git Service
