git.osdn.net Git - android-x86/system-bt.git/log

(root) / android-x86 / system-bt.git / log

Chris Manton [Thu, 1 Oct 2020 07:32:21 +0000 (07:32 +0000)]

Incoming ACL packets stop at acl layer first am: d9f3e3f18a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1443539

Change-Id: I1f881a2b3ea09344168485231bfd23c0541d8d3c

commit | commitdiff | tree

Chris Manton [Thu, 1 Oct 2020 07:31:33 +0000 (07:31 +0000)]

Re-log bta/../LOG_ am: eed7c58c64

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1437480

Change-Id: Iaaa87f772fa6ae6b03ec317636ab582dcbda3f69

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 30 Sep 2020 23:24:29 +0000 (23:24 +0000)]

Merge "Add ACL shim event registration" am: 71202c6785

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1441451

Change-Id: If275b270455f625c4da1345f2d8f53decfe8a97e

commit | commitdiff | tree

Treehugger Robot [Wed, 30 Sep 2020 22:53:40 +0000 (22:53 +0000)]

Merge "Add ACL shim event registration"

commit | commitdiff | tree

Treehugger Robot [Wed, 30 Sep 2020 22:32:17 +0000 (22:32 +0000)]

Merge changes I2f2c69a4,I41a65c6c,I101aa769,I87d34f49,Ifb5e07f6, ... am: c898e62148

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1443015

Change-Id: I07f570638846a4aa4ae9c5bb0da14b76de1f158b

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sal Savage [Wed, 30 Sep 2020 20:17:33 +0000 (20:17 +0000)]

Merge "Properly update config when the MAC Address changes" am: eaa91905c1

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1441627

Change-Id: Id8033beb2c39ee10f8884b2027896cf58a16b8ab

commit | commitdiff | tree

Martin Brabham [Wed, 30 Sep 2020 20:16:33 +0000 (20:16 +0000)]

CertSecurity: Add missing events to registration am: 18de3f6cbe

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1443278

Change-Id: Iaafa9aabe77c5e97c6a7c057989d9d0f824dcab2

commit | commitdiff | tree

Sal Savage [Wed, 30 Sep 2020 20:06:18 +0000 (20:06 +0000)]

Merge "Properly update config when the MAC Address changes"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chris Manton [Wed, 30 Sep 2020 18:29:20 +0000 (18:29 +0000)]

L2cap CoC callback use Confirm not Ind on server am: 5ba9d7c05d

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1442318

Change-Id: I5329aca4e6c6068815f9669ddea4ce92038b38ef

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Dan Shi [Wed, 30 Sep 2020 00:30:27 +0000 (00:30 +0000)]

Remove net_test_bta from TEST_MAPPING file am: 00bb094b4e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1442244

Change-Id: I0c582d20c422a26ed78feb1d57cc3dd9b61bdf3b

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Sep 2020 19:16:31 +0000 (19:16 +0000)]

Merge changes Iefb88b7e,Ia8fd678c,Ieefd35fa,Ib474f0be,I16606384, ... am: a560910b82

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440280

Change-Id: Ibc2228c57c300aecf3b6cb478af3641cb484202c

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Sep 2020 17:57:46 +0000 (17:57 +0000)]

Merge "Reject SetBrowsedPlayer if there is not browsable player" am: e5004b17be

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440735

Change-Id: I72c072a63ce1e554053016e39a7596bb40cfcccc

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Sep 2020 17:31:58 +0000 (17:31 +0000)]

Merge "Reject SetBrowsedPlayer if there is not browsable player"

commit | commitdiff | tree

Hansong Zhang [Tue, 29 Sep 2020 17:19:46 +0000 (17:19 +0000)]

L2cap shim: Add mtu requirement to config option am: e7a8457e3c

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1441616

Change-Id: Id75d31be9b610a1cd0f10de0be3f08339889b151

commit | commitdiff | tree

Alain Vongsouvanh [Tue, 29 Sep 2020 17:18:42 +0000 (17:18 +0000)]

Merge "GAP: Support 128-bit custom UUID in EIR record" am: 431af678ec

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1212758

Change-Id: Iba63cca19d976d004b2a46e4f4e2d1e450219373

commit | commitdiff | tree

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

commit | commitdiff | tree

Alain Vongsouvanh [Tue, 29 Sep 2020 17:00:02 +0000 (17:00 +0000)]

Merge "GAP: Support 128-bit custom UUID in EIR record"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Tue, 29 Sep 2020 03:15:00 +0000 (03:15 +0000)]

GD L2cap: Add a way to enforce required mtu am: 189816c3fe

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1441612

Change-Id: I3363747b6e168478947a779af20cfd333fdb5e03

commit | commitdiff | tree

Hansong Zhang [Tue, 29 Sep 2020 03:14:56 +0000 (03:14 +0000)]

GAP_ConnOpen code minor clean up am: 21632e0b62

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1441611

Change-Id: Ie66737d784407cb87c200c9786d00c0ccbf6730a

commit | commitdiff | tree

Hansong Zhang [Tue, 29 Sep 2020 03:14:16 +0000 (03:14 +0000)]

LE COC: Indicate channel open on ConnectRsp recv am: 6613113056

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440334

Change-Id: I81c978939c6bf1bd34b1218db58140696a76b0d4

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Sep 2020 00:49:45 +0000 (00:49 +0000)]

Merge "Call EXPECT_CALL before the incoming event" am: e4bfe75a30

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440335

Change-Id: I02ee5fb7f129272f6d3b9679c080f26c0c1d776d

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Sep 2020 00:49:15 +0000 (00:49 +0000)]

Merge "Call EXPECT_CALL before the incoming event"

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Sep 2020 00:48:56 +0000 (00:48 +0000)]

Merge "SM: Implement name request during Classic pairing" am: d165f580d1

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1427614

Change-Id: Iabe7191aa6c49e713210d8b37fe181a41164b8e9

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Sep 2020 00:00:20 +0000 (00:00 +0000)]

Merge "SM: Implement name request during Classic pairing"

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 23:19:52 +0000 (23:19 +0000)]

L2CAP: Remove unused ConnectRsp am: 3dbda905a5

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440333

Change-Id: I1c1428f21cc3233903e686f9cae3b922e08c8518

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:41:52 +0000 (21:41 +0000)]

RFCOMM, AVDT, HID: L2cap signal id is not used am: ade4d449cd

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440416

Change-Id: I4399b307c9f1bcc565319eba09b60a9a49133bf2

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 21:28:57 +0000 (21:28 +0000)]

Include initial remote config in pL2CA_ConfigCfm_Cb am: aec9dadc2e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440332

Change-Id: I4d30931e1ce85e2593d04ef2fdae81bae5952cfd

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:55:14 +0000 (20:55 +0000)]

Serialize L2CAP connect ind/cfm, config ind, cfm am: b737b6dcda

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440691

Change-Id: I20205d2b00a0576eb2413dce747356262db40bf2

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:55:12 +0000 (20:55 +0000)]

L2cap: Auto send ConnectRsp am: d8d7224c2e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440654

Change-Id: I260ba6995b80b8f1ffc8bfee879c9b27d3320b04

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:55:08 +0000 (20:55 +0000)]

Check for control block nullptr on l2cap error am: d77658a680

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440653

Change-Id: I3c574634a60a0a4f376b8670330a848045689efb

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:55:05 +0000 (20:55 +0000)]

L2cap channel cb: Store who initiated dynamic channel am: 7bfe49749a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440652

Change-Id: I3c642a89b7ca5c38fad8ed3905f224a32c67a738

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:55:02 +0000 (20:55 +0000)]

We always send pL2CA_ConfigCfm_Cb with status OK am: 40b23cc4ab

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440651

Change-Id: I21c840a6db17549af0a378cf5af3f57c91facd93

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:54:58 +0000 (20:54 +0000)]

L2cap shim clean up am: ee79913590

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440315

Change-Id: I4158575f6fc937f5c061aad1e9bf14b72381c274

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:54:55 +0000 (20:54 +0000)]

L2CAP_FLUSHABLE_PKT is never used am: 6b63057385

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440314

Change-Id: Ie5273670372d83b30ff1f6cf3406843496d917d7

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:54:51 +0000 (20:54 +0000)]

Minor clean up in l2c_api am: 324f7e9cec

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440313

Change-Id: I436a7ffeabe9c926062f05831aea7056396b1158

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:54:48 +0000 (20:54 +0000)]

L2cap: Simplify DisconnectRsp am: 014930dadc

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440312

Change-Id: Iefab338e11f2815cce8e352d679f2e410cae93a0

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:54:29 +0000 (20:54 +0000)]

Remove unused L2cap code am: 2d291bead0

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440311

Change-Id: Ie3beca412e99a47bfe4d2d07452ed1d98388d0ef

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:54:24 +0000 (20:54 +0000)]

Simplify avdt_sec_check_complete_term am: 1d6fa5e136

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1439087

Change-Id: Ie361553e46e0bf5c56503b0a1153d9791bba476f

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 20:53:44 +0000 (20:53 +0000)]

Simplify bnep_sec_check_complete am: 86fbde4a5e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1439086

Change-Id: Idb4a0b924b656e23556d6161da055fe6a8de2398

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 19:03:43 +0000 (19:03 +0000)]

l2c_csm: Use pL2CA_Error_Cb on error am: 30a07c56e1

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1439085

Change-Id: I5d53012f81c0ee4358948654418600b897f1f34b

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 19:02:50 +0000 (19:02 +0000)]

Regard L2CAP_CFG_PENDING as failure am: 5b85860bd5

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1439084

Change-Id: I9d42ccf85dc915acb2561a63d2718bbb1d5c08bf

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 16:48:11 +0000 (16:48 +0000)]

Introduce pL2CA_Error_Cb am: b6e5a07555

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1439083

Change-Id: I4af7949c994761ee6b3a7b6c2808a8077fafdfc7

commit | commitdiff | tree

Hansong Zhang [Mon, 28 Sep 2020 16:47:19 +0000 (16:47 +0000)]

l2c_csm: Remove unused variable am: 5020f1c00f

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1439082

Change-Id: I7a4ad9d2b31de4811798dcbb206702be137de7b2

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

system/bt

RSS Atom

About OSDN

Find Software

Develop Software

Help