OSDN Git Service

android-x86/system-bt.git
3 years agoRemove unused var tBTM_CB::state_temp_buffer am: ea115fe4f9 am: 8355ea5411
Chris Manton [Sun, 4 Oct 2020 00:01:23 +0000 (00:01 +0000)]
Remove unused var tBTM_CB::state_temp_buffer am: ea115fe4f9 am: 8355ea5411

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

Change-Id: I3f75fd5cbc59f88a93b9fe986c0bb9ebde0ebe5b

3 years agoEncapsulate tBTM_CB::btm_scn am: d6e3ce8d7b am: 48da3842f9
Chris Manton [Sun, 4 Oct 2020 00:01:20 +0000 (00:01 +0000)]
Encapsulate tBTM_CB::btm_scn am: d6e3ce8d7b am: 48da3842f9

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

Change-Id: I09fbaf4d3d6db459a01ec4cfaf8a1a00a5fdadc1

3 years agoEncapsulate tBTM_CB::enc_rand, ediv, key_size am: 829451f652 am: f9757fd5b3
Chris Manton [Sun, 4 Oct 2020 00:01:18 +0000 (00:01 +0000)]
Encapsulate tBTM_CB::enc_rand, ediv, key_size am: 829451f652 am: f9757fd5b3

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

Change-Id: I90a56480adcad63e213dc741f0318b0c49d90936

3 years agoEncapsulate tBTM_CB::enc_handle am: ddf998bdd8 am: 08b983a655
Chris Manton [Sun, 4 Oct 2020 00:01:16 +0000 (00:01 +0000)]
Encapsulate tBTM_CB::enc_handle am: ddf998bdd8 am: 08b983a655

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

Change-Id: Ic83e1477ce42cef3b565cd84b7b8ff9997cafeeb

3 years agoL2CA_SetFlushTimeout does nothing. am: 928e707151 am: b94da5c908
Chris Manton [Sun, 4 Oct 2020 00:01:14 +0000 (00:01 +0000)]
L2CA_SetFlushTimeout does nothing. am: 928e707151 am: b94da5c908

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

Change-Id: Ia16675f89e3ca84c97b1f72d8e24b02b5163a602

3 years agoRe-align read remote version information on legacy am: 2c0a6c7825 am: 0ed186f937
Chris Manton [Sun, 4 Oct 2020 00:01:12 +0000 (00:01 +0000)]
Re-align read remote version information on legacy am: 2c0a6c7825 am: 0ed186f937

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

Change-Id: I039ee6270e231dc5d4d97d47493c5a3cc501ad48

3 years agoRemove unused var tBTM_CB::state_temp_buffer am: ea115fe4f9
Chris Manton [Sat, 3 Oct 2020 23:44:04 +0000 (23:44 +0000)]
Remove unused var tBTM_CB::state_temp_buffer am: ea115fe4f9

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

Change-Id: If0893c1acdc32b705f1079baabe3df8846e62fb7

3 years agoEncapsulate tBTM_CB::btm_scn am: d6e3ce8d7b
Chris Manton [Sat, 3 Oct 2020 23:44:01 +0000 (23:44 +0000)]
Encapsulate tBTM_CB::btm_scn am: d6e3ce8d7b

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

Change-Id: I8ab322ab8de370a948d02c013f7ed653a9da75b1

3 years agoEncapsulate tBTM_CB::enc_rand, ediv, key_size am: 829451f652
Chris Manton [Sat, 3 Oct 2020 23:43:58 +0000 (23:43 +0000)]
Encapsulate tBTM_CB::enc_rand, ediv, key_size am: 829451f652

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

Change-Id: I9dfdee968a86275055b72df5080e69859bc977e2

3 years agoEncapsulate tBTM_CB::enc_handle am: ddf998bdd8
Chris Manton [Sat, 3 Oct 2020 23:43:54 +0000 (23:43 +0000)]
Encapsulate tBTM_CB::enc_handle am: ddf998bdd8

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

Change-Id: I33c4b30837443b28da57fd176c3bb6bac5a7a917

3 years agoL2CA_SetFlushTimeout does nothing. am: 928e707151
Chris Manton [Sat, 3 Oct 2020 23:43:51 +0000 (23:43 +0000)]
L2CA_SetFlushTimeout does nothing. am: 928e707151

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

Change-Id: I94343d6e59b0f43f2ae2ad816c2ac5635fb8bb5b

3 years agoRe-align read remote version information on legacy am: 2c0a6c7825
Chris Manton [Sat, 3 Oct 2020 23:43:11 +0000 (23:43 +0000)]
Re-align read remote version information on legacy am: 2c0a6c7825

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

Change-Id: Id708d38839dbf2d8e7187f24930aefc2bd4f6acb

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 am: 75710e9095 am...
Treehugger Robot [Sat, 3 Oct 2020 01:15:13 +0000 (01:15 +0000)]
Merge changes Ib1f71d7e,I917ba220,Ic58e879c,If152037d,I063d0092 am: 75710e9095 am: e55d8e607d

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

Change-Id: I42767803a1f0c1dd9b605fe8332fa3d31d0b94dc

3 years agoMerge changes Ib1f71d7e,I917ba220,Ic58e879c,If152037d,I063d0092 am: 75710e9095
Treehugger Robot [Sat, 3 Oct 2020 01:01:18 +0000 (01:01 +0000)]
Merge changes Ib1f71d7e,I917ba220,Ic58e879c,If152037d,I063d0092 am: 75710e9095

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

Change-Id: I2bb6be2e34529f6df81a531dc4ed7e86f614b18e

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" am: 23536aebcb am: 646c2db933
Treehugger Robot [Sat, 3 Oct 2020 00:36:00 +0000 (00:36 +0000)]
Merge "Convert mask types from uint32_t to enum type" am: 23536aebcb am: 646c2db933

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

Change-Id: I59c1da34a7107db0342484a31171856e0beda024

3 years agoMerge "Convert mask types from uint32_t to enum type" am: 23536aebcb
Treehugger Robot [Sat, 3 Oct 2020 00:20:18 +0000 (00:20 +0000)]
Merge "Convert mask types from uint32_t to enum type" am: 23536aebcb

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

Change-Id: Ibd9ca304fde7ba2b3865bda0812208f50276551a

3 years agoSMP: Assume L2cap tx completes immediately am: 8326b49c4c am: e97dd91039
Hansong Zhang [Fri, 2 Oct 2020 23:36:24 +0000 (23:36 +0000)]
SMP: Assume L2cap tx completes immediately am: 8326b49c4c am: e97dd91039

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

Change-Id: I286d312edb3cbdf0f67bf569bb21caf3025163da

3 years agoL2cap: LE address type is not used am: 08a28c0cb7 am: c3b821e919
Hansong Zhang [Fri, 2 Oct 2020 23:36:20 +0000 (23:36 +0000)]
L2cap: LE address type is not used am: 08a28c0cb7 am: c3b821e919

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

Change-Id: I772391fe5bc80a71b94ee11a18617d2495ee40d3

3 years agoLink flush timeout is unused am: 12a0975cd7 am: 3a9ff02ce7
Hansong Zhang [Fri, 2 Oct 2020 23:36:19 +0000 (23:36 +0000)]
Link flush timeout is unused am: 12a0975cd7 am: 3a9ff02ce7

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

Change-Id: I9fdaf1a2fa3e6837e172108e2ef2056401ba929b

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 am: 8326b49c4c
Hansong Zhang [Fri, 2 Oct 2020 23:16:31 +0000 (23:16 +0000)]
SMP: Assume L2cap tx completes immediately am: 8326b49c4c

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

Change-Id: I257fd78f2b5413d0858ccd3f1c073297e61f70bd

3 years agoL2cap: LE address type is not used am: 08a28c0cb7
Hansong Zhang [Fri, 2 Oct 2020 23:16:22 +0000 (23:16 +0000)]
L2cap: LE address type is not used am: 08a28c0cb7

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

Change-Id: I41fe290dec074238a22c01100afd664640ffed16

3 years agoLink flush timeout is unused am: 12a0975cd7
Hansong Zhang [Fri, 2 Oct 2020 23:15:40 +0000 (23:15 +0000)]
Link flush timeout is unused am: 12a0975cd7

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

Change-Id: Ie633a77db877c5e3e99528680b790fd886f90cd6

3 years agoHIDH: Don't set a minimum MTU am: 85ef9c4772 am: c58fba31a3
Myles Watson [Fri, 2 Oct 2020 22:53:40 +0000 (22:53 +0000)]
HIDH: Don't set a minimum MTU am: 85ef9c4772 am: c58fba31a3

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

Change-Id: I3259a49b9e02cc8162bc0cf9cb7418e67fec52e1

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 agoHIDH: Don't set a minimum MTU am: 85ef9c4772
Myles Watson [Fri, 2 Oct 2020 22:37:04 +0000 (22:37 +0000)]
HIDH: Don't set a minimum MTU am: 85ef9c4772

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

Change-Id: I75f73aead0b8661c7897b222c77077e84d572477

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 agoAdd ACL shim event registration - with deps am: 2f01df7224 am: c2a6ac2aad
Chris Manton [Fri, 2 Oct 2020 16:51:59 +0000 (16:51 +0000)]
Add ACL shim event registration - with deps am: 2f01df7224 am: c2a6ac2aad

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

Change-Id: Ibd7dd24dd86e606a793b413ef307d8a9e5ff822c

3 years agoSingle out Register events LE_META_EVENT as special am: f58215f418 am: 44f0621643
Chris Manton [Fri, 2 Oct 2020 16:51:57 +0000 (16:51 +0000)]
Single out Register events LE_META_EVENT as special am: f58215f418 am: 44f0621643

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

Change-Id: Ib78883c601a0d2b78c60485c95cd3375689ddf62

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 am: 2f01df7224
Chris Manton [Fri, 2 Oct 2020 16:32:29 +0000 (16:32 +0000)]
Add ACL shim event registration - with deps am: 2f01df7224

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

Change-Id: Id5691b65ae6198a10f33791dce20775d8b72f43d

3 years agoSingle out Register events LE_META_EVENT as special am: f58215f418
Chris Manton [Fri, 2 Oct 2020 16:31:46 +0000 (16:31 +0000)]
Single out Register events LE_META_EVENT as special am: f58215f418

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

Change-Id: Ib9d443e9048851b34ef33b5f5ecce62180301f3c

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" am: 63a115e407 am: ed1935c9e6
Jakub Pawlowski [Fri, 2 Oct 2020 07:51:59 +0000 (07:51 +0000)]
Merge "Store LE device keys when bonded" am: 63a115e407 am: ed1935c9e6

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

Change-Id: I780dcf310001ef1118ea0198471ff006dbc9384f

3 years agoMerge "Store LE device keys when bonded" am: 63a115e407
Jakub Pawlowski [Fri, 2 Oct 2020 07:13:58 +0000 (07:13 +0000)]
Merge "Store LE device keys when bonded" am: 63a115e407

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

Change-Id: I3017c883fce238567ddb4bcac940962e6633e720

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" am: 0978770013 am: b6328e08f8
Treehugger Robot [Fri, 2 Oct 2020 02:50:11 +0000 (02:50 +0000)]
Merge "HIDH: Register for HID_PSM_CONTROL" am: 0978770013 am: b6328e08f8

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

Change-Id: Ia084b3eb5096bb6280c6dde2d75cb7fa21273a3c

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

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

Change-Id: Ia0290a8bed8f07f510717f1fcb66548cf545d65e

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"" am: 467dd9cb60 am: 4f7150e3f3
Treehugger Robot [Fri, 2 Oct 2020 00:26:06 +0000 (00:26 +0000)]
Merge "Revert "Add ACL shim event registration"" am: 467dd9cb60 am: 4f7150e3f3

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

Change-Id: Iffd24ef4358a273a420c869cf5ab2f44606e22a9

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

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

Change-Id: I77b17f765429cef715a9888dca7b377664d531fd

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 agoL2cap user dynamic channel: move psm alloc to bta am: ca3b34e4de am: 696986fbf5
Hansong Zhang [Thu, 1 Oct 2020 21:06:17 +0000 (21:06 +0000)]
L2cap user dynamic channel: move psm alloc to bta am: ca3b34e4de am: 696986fbf5

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

Change-Id: Id4f15705c9707af39f6771c83ac6d069b8e9bb50

3 years agoClean up unused avdt definitions am: f7cb243d3c am: a98512400b
Hansong Zhang [Thu, 1 Oct 2020 21:06:13 +0000 (21:06 +0000)]
Clean up unused avdt definitions am: f7cb243d3c am: a98512400b

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

Change-Id: I9422ac875bc2dcdb68a6453bff9e23eedd461833

3 years agoL2cap user dynamic channel: move psm alloc to bta am: ca3b34e4de
Hansong Zhang [Thu, 1 Oct 2020 20:43:05 +0000 (20:43 +0000)]
L2cap user dynamic channel: move psm alloc to bta am: ca3b34e4de

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

Change-Id: I5acd29f16654866ec6876ba4e030d8795e94e964

3 years agoClean up unused avdt definitions am: f7cb243d3c
Hansong Zhang [Thu, 1 Oct 2020 20:42:21 +0000 (20:42 +0000)]
Clean up unused avdt definitions am: f7cb243d3c

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

Change-Id: I89a587492da156483f685a66b49480dabe00e38f

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" am: c0b890c4f9 am: 25586afa90
Treehugger Robot [Thu, 1 Oct 2020 18:35:29 +0000 (18:35 +0000)]
Merge changes from topic "gd_security_shim" am: c0b890c4f9 am: 25586afa90

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

Change-Id: If9f0e83102bd29a591997b354eaa1d6fd3ff585a

3 years agoBTA_AV: Unused variables am: 88c29c75de am: ca85d65a95
Hansong Zhang [Thu, 1 Oct 2020 18:35:16 +0000 (18:35 +0000)]
BTA_AV: Unused variables am: 88c29c75de am: ca85d65a95

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

Change-Id: I00dcdde8abd7e2f3887408ee781b62a78e1bb11e

3 years agoL2CA_SetFlushTimeout does nothing. am: 407d7fb54f am: 54b8ca40db
Hansong Zhang [Thu, 1 Oct 2020 18:35:15 +0000 (18:35 +0000)]
L2CA_SetFlushTimeout does nothing. am: 407d7fb54f am: 54b8ca40db

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

Change-Id: Ibff3d17b4f4fc46a60787c198354f613626a99ad

3 years agoL2cap: clean up flush timeout option am: d38a1018c7 am: 9723d8ca98
Hansong Zhang [Thu, 1 Oct 2020 18:35:12 +0000 (18:35 +0000)]
L2cap: clean up flush timeout option am: d38a1018c7 am: 9723d8ca98

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

Change-Id: I6fa3ee620c3e1986802e0b0a9fd9405f2aeb0053

3 years agoBTA_AV: Unused variable am: a78a7f5bba am: 4d544d2180
Hansong Zhang [Thu, 1 Oct 2020 18:35:08 +0000 (18:35 +0000)]
BTA_AV: Unused variable am: a78a7f5bba am: 4d544d2180

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

Change-Id: Icf274dad2c288a548b6e6b181848244ee279b437

3 years agoBTA_AV: Simplify flush timeout parameter am: 83db55569e am: 64503b3db7
Hansong Zhang [Thu, 1 Oct 2020 18:35:03 +0000 (18:35 +0000)]
BTA_AV: Simplify flush timeout parameter am: 83db55569e am: 64503b3db7

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

Change-Id: I697231ea032873647a48c90c8745f9d8e4963b31

3 years agoMerge changes from topic "gd_security_shim" am: c0b890c4f9
Treehugger Robot [Thu, 1 Oct 2020 18:26:21 +0000 (18:26 +0000)]
Merge changes from topic "gd_security_shim" am: c0b890c4f9

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

Change-Id: I4560689aa7a0b593c1ef99b54e6fb322fe8ca199

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 agoBTA_AV: Unused variables am: 88c29c75de
Hansong Zhang [Thu, 1 Oct 2020 18:17:50 +0000 (18:17 +0000)]
BTA_AV: Unused variables am: 88c29c75de

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

Change-Id: I2fab2416f6e57515f4f2736c32c6f482e9653b16

3 years agoL2CA_SetFlushTimeout does nothing. am: 407d7fb54f
Hansong Zhang [Thu, 1 Oct 2020 18:17:46 +0000 (18:17 +0000)]
L2CA_SetFlushTimeout does nothing. am: 407d7fb54f

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

Change-Id: I2c61e4fe9876083f8c7b777885a4838be3299e5f

3 years agoL2cap: clean up flush timeout option am: d38a1018c7
Hansong Zhang [Thu, 1 Oct 2020 18:17:42 +0000 (18:17 +0000)]
L2cap: clean up flush timeout option am: d38a1018c7

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

Change-Id: I0128d6adaf179e083fc001489c134f717f868ec9

3 years agoBTA_AV: Unused variable am: a78a7f5bba
Hansong Zhang [Thu, 1 Oct 2020 18:17:39 +0000 (18:17 +0000)]
BTA_AV: Unused variable am: a78a7f5bba

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

Change-Id: I57ce28351d459d66b8266c14abbdca6ab72489b8

3 years agoBTA_AV: Simplify flush timeout parameter am: 83db55569e
Hansong Zhang [Thu, 1 Oct 2020 18:16:57 +0000 (18:16 +0000)]
BTA_AV: Simplify flush timeout parameter am: 83db55569e

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

Change-Id: If5af90be05749f2dead9c05594bcb9f5de294fbb

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 agoL2cap: our cfg option never uses flush timeout am: 6606d192a4 am: 9e97957e6b
Hansong Zhang [Thu, 1 Oct 2020 07:51:57 +0000 (07:51 +0000)]
L2cap: our cfg option never uses flush timeout am: 6606d192a4 am: 9e97957e6b

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

Change-Id: Ie0491a3e9115cf614bc0448804df9290eb983182

3 years agoMerge "Use bta/sys/bta_sys::BtaIdSysText()" am: 56f4b403b2 am: 22ec3bb2c6
Treehugger Robot [Thu, 1 Oct 2020 07:51:14 +0000 (07:51 +0000)]
Merge "Use bta/sys/bta_sys::BtaIdSysText()" am: 56f4b403b2 am: 22ec3bb2c6

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

Change-Id: I8fad24d24caea0390ba0b51a38f87fe90729d1b1

3 years agoIncoming ACL packets stop at acl layer first am: d9f3e3f18a am: 1e410a9b15
Chris Manton [Thu, 1 Oct 2020 07:50:10 +0000 (07:50 +0000)]
Incoming ACL packets stop at acl layer first am: d9f3e3f18a am: 1e410a9b15

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

Change-Id: I35025154f988b62a039e8a4e9ff1384a2fa45e8a

3 years agoRe-log bta/../LOG_ am: eed7c58c64 am: bdf5a1f6cb
Chris Manton [Thu, 1 Oct 2020 07:50:05 +0000 (07:50 +0000)]
Re-log bta/../LOG_ am: eed7c58c64 am: bdf5a1f6cb

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

Change-Id: Id17bb9691ff24aeac2f6b65240f6dcfcf98554af

3 years agoL2cap: our cfg option never uses flush timeout am: 6606d192a4
Hansong Zhang [Thu, 1 Oct 2020 07:32:54 +0000 (07:32 +0000)]
L2cap: our cfg option never uses flush timeout am: 6606d192a4

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

Change-Id: Id67aa42f76b52bc2019a93972482ad217de4df45

3 years agoMerge "Use bta/sys/bta_sys::BtaIdSysText()" am: 56f4b403b2
Treehugger Robot [Thu, 1 Oct 2020 07:32:45 +0000 (07:32 +0000)]
Merge "Use bta/sys/bta_sys::BtaIdSysText()" am: 56f4b403b2

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

Change-Id: Id1718b0e7055453025e8bd4810279644d8c16693

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

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

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 agoMerge "Add ACL shim event registration" am: 71202c6785 am: 37f641ad3e
Treehugger Robot [Wed, 30 Sep 2020 23:37:59 +0000 (23:37 +0000)]
Merge "Add ACL shim event registration" am: 71202c6785 am: 37f641ad3e

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

Change-Id: I0996ea870d101c510530fcbb3c53f7654b5c4eea

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" am: 71202c6785
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