OSDN Git Service

android-x86/system-bt.git
3 years agoRe-log btif/src/btif_sdp_server::
Chris Manton [Thu, 24 Sep 2020 18:15:58 +0000 (11:15 -0700)]
Re-log btif/src/btif_sdp_server::

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ia57c281cc844a4c254c53324a4c4bd1eaf7af1c3

3 years agoRemove unused decls stack/btm/btm_int
Chris Manton [Sun, 20 Sep 2020 22:20:48 +0000 (15:20 -0700)]
Remove unused decls stack/btm/btm_int

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: If3c47ffa09fa458a381a381cddc6f37a9835f7a4

3 years agoenum-ify BTM_SEC_ and BTM_SEC_LE
Chris Manton [Sun, 20 Sep 2020 20:10:11 +0000 (13:10 -0700)]
enum-ify BTM_SEC_ and BTM_SEC_LE

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ifde2b62d2e368188d3454236b616adc2ca9dfcce

3 years agoRemove unused var tBTM_CB::state_temp_buffer
Chris Manton [Sun, 20 Sep 2020 20:14:00 +0000 (13:14 -0700)]
Remove unused var tBTM_CB::state_temp_buffer

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I2b6ffcae31b3b6fea84e59fac01962609557217b

3 years agoEncapsulate tBTM_CB::btm_scn
Chris Manton [Sun, 20 Sep 2020 19:46:31 +0000 (12:46 -0700)]
Encapsulate tBTM_CB::btm_scn

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ic947434651ba3312342507ac1ff4da92e176b0bb

3 years agoEncapsulate tBTM_CB::enc_rand, ediv, key_size
Chris Manton [Sun, 20 Sep 2020 16:13:26 +0000 (09:13 -0700)]
Encapsulate tBTM_CB::enc_rand, ediv, key_size

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I7e5962356b64b52011e370deb03b53a2ca4b42ad

3 years agoEncapsulate tBTM_CB::enc_handle
Chris Manton [Sun, 20 Sep 2020 16:01:13 +0000 (09:01 -0700)]
Encapsulate tBTM_CB::enc_handle

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: I735a002c545f62ae75676e72d068a2f3d097eda9

3 years agoL2CA_SetFlushTimeout does nothing.
Chris Manton [Sat, 3 Oct 2020 20:19:51 +0000 (13:19 -0700)]
L2CA_SetFlushTimeout does nothing.

aosp/1443546

Bug: 159815595
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink
Change-Id: Ib18923477830f5f5bf2c8748da5a817a9871ec1e

3 years agoRe-align read remote version information on legacy
Chris Manton [Sat, 3 Oct 2020 17:01:53 +0000 (10:01 -0700)]
Re-align read remote version information on legacy

Bug: 166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I7be1ecba73234431194ad9702ec3ea06b09c60bc

3 years agoMerge changes Ib1f71d7e,I917ba220,Ic58e879c,If152037d,I063d0092
Treehugger Robot [Sat, 3 Oct 2020 00:46:19 +0000 (00:46 +0000)]
Merge changes Ib1f71d7e,I917ba220,Ic58e879c,If152037d,I063d0092

* changes:
  Precise naming match => is_in_security_db
  enum-ify _SCAN both classic and ble
  enum-ify _INQUIRY both classic and ble
  enum-ify _CONNECTABLE both classic and ble
  enum-ify _DISCOVERABLE both classic and ble

3 years agoMerge "Convert mask types from uint32_t to enum type"
Treehugger Robot [Fri, 2 Oct 2020 23:30:05 +0000 (23:30 +0000)]
Merge "Convert mask types from uint32_t to enum type"

3 years agoSMP: Assume L2cap tx completes immediately
Hansong Zhang [Fri, 2 Oct 2020 00:47:03 +0000 (17:47 -0700)]
SMP: Assume L2cap tx completes immediately

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5bf5c5067f3ad3d48716fdc65f73920107d034cf

3 years agoL2cap: LE address type is not used
Hansong Zhang [Thu, 1 Oct 2020 07:03:59 +0000 (00:03 -0700)]
L2cap: LE address type is not used

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie13f6e7cda6feb23d25ae661abeb7221757e9da7

3 years agoLink flush timeout is unused
Hansong Zhang [Thu, 1 Oct 2020 06:53:46 +0000 (23:53 -0700)]
Link flush timeout is unused

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Icf6fec9bd038210a31eb8ab38a96f44d3ce2ffd2

3 years agoConvert mask types from uint32_t to enum type
Mikhail Naganov [Fri, 2 Oct 2020 01:08:16 +0000 (18:08 -0700)]
Convert mask types from uint32_t to enum type

This applies to the following types:

- audio_gain_mode_t;
- audio_flags_mask_t;
- audio_channel_representation_t;
- audio_channel_mask_t;
- audio_devices_t.

Enum types are distinct thus proper overloading on the type
is possible in C++. Also, assignments to enum types are
less prone to errors.

Bug: 169889714
Test: basic audio functionality
Tag: #refactor
Change-Id: I7b064b282ce9f533f91ef13a4852b3e9f308f6c0

3 years agoPrecise naming match => is_in_security_db
Chris Manton [Sun, 20 Sep 2020 15:43:57 +0000 (08:43 -0700)]
Precise naming match => is_in_security_db

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Ib1f71d7e94ab471a04c25b74cfb8cda5fab3cef5

3 years agoenum-ify _SCAN both classic and ble
Chris Manton [Sun, 20 Sep 2020 06:29:24 +0000 (23:29 -0700)]
enum-ify _SCAN both classic and ble

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I917ba2204a79af800afefe1b7e046a9510316030

3 years agoenum-ify _INQUIRY both classic and ble
Chris Manton [Sun, 20 Sep 2020 06:21:23 +0000 (23:21 -0700)]
enum-ify _INQUIRY both classic and ble

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: Ic58e879c9b62fcba510111b178e0aa092873bcac

3 years agoenum-ify _CONNECTABLE both classic and ble
Chris Manton [Sun, 20 Sep 2020 05:50:58 +0000 (22:50 -0700)]
enum-ify _CONNECTABLE both classic and ble

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: If152037d43646197b456dfe6174bb897f4911c3a

3 years agoenum-ify _DISCOVERABLE both classic and ble
Chris Manton [Sun, 20 Sep 2020 05:36:56 +0000 (22:36 -0700)]
enum-ify _DISCOVERABLE both classic and ble

Towards readable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Change-Id: I063d0092569663c25166f15d369b57e6bf88388d

3 years agoHIDH: Don't set a minimum MTU
Myles Watson [Fri, 2 Oct 2020 16:49:50 +0000 (09:49 -0700)]
HIDH: Don't set a minimum MTU

Bug: 169780397
Test: Pair with a logitech 557 mouse
Tag: #gd-refactor
Change-Id: I5ad88645ea45e3ae016f5a6f54017558ae2b8049

3 years agoAdd ACL shim event registration - with deps
Chris Manton [Mon, 28 Sep 2020 20:15:06 +0000 (13:15 -0700)]
Add ACL shim event registration - with deps

Bug: 166280067
Tag: #refactor
Test: gd/cert/run --host
Test: ble paired 2 phones
Test: act.py -tc BleCocTest
Change-Id: I6494212c0f61d478792fc2948c12ae4187576cd1

3 years agoSingle out Register events LE_META_EVENT as special
Chris Manton [Sat, 26 Sep 2020 23:07:41 +0000 (16:07 -0700)]
Single out Register events LE_META_EVENT as special

LE_META_EVENT is a special event that multiplexes LE
events underneath and should not be exposed.

Test Parameters: INIT_gd_hci=true

Bug: 166280067
Tag: #refactor
Test: gd/cert/run --host
Test: ble paired 2 phones
Test: act.py -tc BleCocTest
Change-Id: Idf8dd9fa9e13fc9e2d1d7d89d6af0a16ec574b89

3 years agoMerge "Store LE device keys when bonded"
Jakub Pawlowski [Fri, 2 Oct 2020 06:41:13 +0000 (06:41 +0000)]
Merge "Store LE device keys when bonded"

3 years agoMerge "HIDH: Register for HID_PSM_CONTROL"
Treehugger Robot [Fri, 2 Oct 2020 02:00:35 +0000 (02:00 +0000)]
Merge "HIDH: Register for HID_PSM_CONTROL"

3 years agoMerge "Revert "Add ACL shim event registration""
Treehugger Robot [Thu, 1 Oct 2020 23:19:19 +0000 (23:19 +0000)]
Merge "Revert "Add ACL shim event registration""

3 years agoHIDH: Register for HID_PSM_CONTROL
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

3 years agoRevert "Add ACL shim event registration"
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

3 years agoL2cap user dynamic channel: move psm alloc to bta
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

3 years agoClean up unused avdt definitions
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

3 years agoMerge changes from topic "gd_security_shim"
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

3 years agoBTM Shim: Put/Get information bits to 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

3 years agoIntroduce ConfirmationData
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

3 years agoBTA_AV: Unused variables
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

3 years agoL2CA_SetFlushTimeout does nothing.
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

3 years agoL2cap: clean up flush timeout option
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

3 years agoBTA_AV: Unused variable
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

3 years agoBTA_AV: Simplify flush timeout parameter
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

3 years agoL2cap: our cfg option never uses flush timeout
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

3 years agoMerge "Use bta/sys/bta_sys::BtaIdSysText()"
Treehugger Robot [Thu, 1 Oct 2020 03:06:17 +0000 (03:06 +0000)]
Merge "Use bta/sys/bta_sys::BtaIdSysText()"

3 years agoIncoming ACL packets stop at acl layer first
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

3 years agoRe-log bta/../LOG_
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

3 years agoUse bta/sys/bta_sys::BtaIdSysText()
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

3 years agoMerge "Add ACL shim event registration"
Treehugger Robot [Wed, 30 Sep 2020 22:53:40 +0000 (22:53 +0000)]
Merge "Add ACL shim event registration"

3 years agoMerge changes I2f2c69a4,I41a65c6c,I101aa769,I87d34f49,Ifb5e07f6, ...
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

3 years agoAdd ACL shim event registration
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

3 years agoMerge "Properly update config when the MAC Address changes"
Sal Savage [Wed, 30 Sep 2020 20:06:18 +0000 (20:06 +0000)]
Merge "Properly update config when the MAC Address changes"

3 years agoRemove unnecessary declarations stack/btm/btm_sco
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

3 years agoLocally link and remove unused funcs stack/btm/btm_sco
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

3 years agoRe-log stack/btm/btm_ble_gap::btm_ble_update_inq_result
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

3 years agoRemove duplicate decls stack/btm/btm_int
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

3 years agoLocally link and remove unused funcs stack/btm/btm_inq
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

3 years agoRemove decl stack/btm/btm_int
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

3 years agoLocally link and remove unused funcs stack/btm/btm_devctl
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

3 years agoLocally link and remove unused funcs stack/btm/btm_ble_cont_energy
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

3 years agoLocally link and remove unused funcs stack/btm/btm_ble_adv_filter
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

3 years agoLocally link and remove unused funcs stack/btm/btm_ble_addr
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

3 years agoRemove unnecessary declarations stack/btm/btm_ble_int
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

3 years agoRemove duplicate decls
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

3 years agoAdd bta/sys/bta_sys::BtaIdSysText()
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

3 years agoRe-log parts of btif/src/btif_storage
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

3 years agoRe-log parts of btif/src/btif_sock_thread
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

3 years agoRe-log btif/src/btif_sock_rfc::btsock_rfc_listen
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

3 years agoCertSecurity: Add missing events to registration
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

3 years agoStore LE device keys when bonded
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

3 years agoL2cap CoC callback use Confirm not Ind on server
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

3 years agoRemove net_test_bta from TEST_MAPPING file
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

3 years agoProperly update config when the MAC Address changes
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

3 years agoMerge changes Iefb88b7e,Ia8fd678c,Ieefd35fa,Ib474f0be,I16606384, ...
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

3 years agoMerge "Reject SetBrowsedPlayer if there is not browsable player"
Treehugger Robot [Tue, 29 Sep 2020 17:31:58 +0000 (17:31 +0000)]
Merge "Reject SetBrowsedPlayer if there is not browsable player"

3 years agoL2cap shim: Add mtu requirement to config option
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

3 years agoMerge "GAP: Support 128-bit custom UUID in EIR record"
Alain Vongsouvanh [Tue, 29 Sep 2020 17:00:02 +0000 (17:00 +0000)]
Merge "GAP: Support 128-bit custom UUID in EIR record"

3 years agoRe-log btif/src/btif_dm::btif_dm_cancel_discovery
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

3 years agoRe-log btif/src/btif_dm::btif_dm_search_services_evt
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

3 years agoRe-log btif/src/btif_dm::btif_update_remote_properties
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

3 years agoRe-log btif/src/btif_dm::bond_state_changed
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

3 years agoRe-log btif/src/btif_core::btif_enable_bluetooth_evt
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

3 years agoRe-log btif_get____type
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

3 years agoLog proper btif/src/btif_bqr::ConfigureBqr
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

3 years agoRe-log btif/src/btif_av::btif_av_get_peer_sep
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

3 years agoRe-log btif/src/btif_a2dp::btif_a2dp_on_idle
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

3 years agoRestore Le transport for SetPhy function
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

3 years agoGD L2cap: Add a way to enforce required mtu
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

3 years agoGAP_ConnOpen code minor clean up
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

3 years agoLE COC: Indicate channel open on ConnectRsp recv
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

3 years agoMerge "Call EXPECT_CALL before the incoming event"
Treehugger Robot [Tue, 29 Sep 2020 00:49:15 +0000 (00:49 +0000)]
Merge "Call EXPECT_CALL before the incoming event"

3 years agoMerge "SM: Implement name request during Classic pairing"
Treehugger Robot [Tue, 29 Sep 2020 00:00:20 +0000 (00:00 +0000)]
Merge "SM: Implement name request during Classic pairing"

3 years agoCall EXPECT_CALL before the incoming event
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

3 years agoSM: Implement name request during Classic pairing
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

3 years agoL2CAP: Remove unused ConnectRsp
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

3 years agoRFCOMM, AVDT, HID: L2cap signal id is not used
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

3 years agoInclude initial remote config in pL2CA_ConfigCfm_Cb
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

3 years agoSerialize L2CAP connect ind/cfm, config ind, cfm
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

3 years agoL2cap: Auto send ConnectRsp
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

3 years agoCheck for control block nullptr on l2cap error
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

3 years agoL2cap channel cb: Store who initiated dynamic channel
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

3 years agoWe always send pL2CA_ConfigCfm_Cb with status OK
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

3 years agoL2cap shim clean up
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

3 years agoL2CAP_FLUSHABLE_PKT is never used
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

3 years agoReject SetBrowsedPlayer if there is not browsable player
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