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

OSDN Git Service

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

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Treehugger Robot [Sat, 3 Oct 2020 02:04:00 +0000 (02:04 +0000)]

Merge changes Ib1f71d7e,I917ba220,Ic58e879c,If152037d,I063d0092 am: 75710e9095 am: e55d8e607d am: 2e9ab14058

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

Change-Id: I7451d8863a50098073e803577ee084d541c2d490

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Sat, 3 Oct 2020 00:55:12 +0000 (00:55 +0000)]

Merge "Convert mask types from uint32_t to enum type" am: 23536aebcb am: 646c2db933 am: 3b20f802e9

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

Change-Id: I9067e3d991b54a28f871f01a52ab14d53fb77952

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Sat, 3 Oct 2020 00:20:28 +0000 (00:20 +0000)]

SMP: Assume L2cap tx completes immediately am: 8326b49c4c am: e97dd91039 am: d8262faed1

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

Change-Id: Ib53d88e40af2c8414c003ccf7cc2e226a9ca29d5

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Sat, 3 Oct 2020 00:20:14 +0000 (00:20 +0000)]

L2cap: LE address type is not used am: 08a28c0cb7 am: c3b821e919 am: eeb9094cbf

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

Change-Id: I224ae0f2b624e07e51046d826672f1e80858bdfd

commit | commitdiff | tree

Hansong Zhang [Sat, 3 Oct 2020 00:20:12 +0000 (00:20 +0000)]

Link flush timeout is unused am: 12a0975cd7 am: 3a9ff02ce7 am: e7f5ba8eb5

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

Change-Id: I8abaf28b92d085c37287d8c97c8d03f81abc6a49

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Fri, 2 Oct 2020 23:30:05 +0000 (23:30 +0000)]

Merge "Convert mask types from uint32_t to enum type"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Myles Watson [Fri, 2 Oct 2020 23:13:59 +0000 (23:13 +0000)]

HIDH: Don't set a minimum MTU am: 85ef9c4772 am: c58fba31a3 am: 9c28d5e388

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

Change-Id: I66ce7b6a772a11df61e5c50e1d150522b821d79d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chris Manton [Fri, 2 Oct 2020 17:16:59 +0000 (17:16 +0000)]

Add ACL shim event registration - with deps am: 2f01df7224 am: c2a6ac2aad am: 03b237f8b7

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

Change-Id: Ie141de370ea513fb481c7937691d727180ea6213

commit | commitdiff | tree

Chris Manton [Fri, 2 Oct 2020 17:16:56 +0000 (17:16 +0000)]

Single out Register events LE_META_EVENT as special am: f58215f418 am: 44f0621643 am: 79715495b1

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

Change-Id: I8521707e91c9b0db373de9238652c4434f4ff0d4

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jakub Pawlowski [Fri, 2 Oct 2020 08:35:23 +0000 (08:35 +0000)]

Merge "Store LE device keys when bonded" am: 63a115e407 am: ed1935c9e6 am: d1c25e2857

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

Change-Id: Ic1cfbf438d83ab9a9bcc829ab18590816551ed07

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jakub Pawlowski [Fri, 2 Oct 2020 06:41:13 +0000 (06:41 +0000)]

Merge "Store LE device keys when bonded"

commit | commitdiff | tree

Treehugger Robot [Fri, 2 Oct 2020 03:12:28 +0000 (03:12 +0000)]

Merge "HIDH: Register for HID_PSM_CONTROL" am: 0978770013 am: b6328e08f8 am: 42046ba53a

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

Change-Id: Ief84e6f58d62b76b894a143aeecdb75c19fb6c15

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Fri, 2 Oct 2020 02:00:35 +0000 (02:00 +0000)]

Merge "HIDH: Register for HID_PSM_CONTROL"

commit | commitdiff | tree

Treehugger Robot [Fri, 2 Oct 2020 00:52:16 +0000 (00:52 +0000)]

Merge "Revert "Add ACL shim event registration"" am: 467dd9cb60 am: 4f7150e3f3 am: 2785817c54

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

Change-Id: I5d899df75715ea802af8002444449a26260e099f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 1 Oct 2020 23:19:19 +0000 (23:19 +0000)]

Merge "Revert "Add ACL shim event registration""

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Thu, 1 Oct 2020 22:05:00 +0000 (22:05 +0000)]

L2cap user dynamic channel: move psm alloc to bta am: ca3b34e4de am: 696986fbf5 am: fd63007651

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

Change-Id: I5442983ad22afcd3abcde0c6a8cc0f9e9c22fd28

commit | commitdiff | tree

Hansong Zhang [Thu, 1 Oct 2020 22:04:56 +0000 (22:04 +0000)]

Clean up unused avdt definitions am: f7cb243d3c am: a98512400b am: a6e6e13e36

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

Change-Id: I64169b6400cce24e7a04612fa7153677897e3289

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 1 Oct 2020 18:53:09 +0000 (18:53 +0000)]

Merge changes from topic "gd_security_shim" am: c0b890c4f9 am: 25586afa90 am: a00ea136ab

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

Change-Id: I1ce9e3e01ae43ee26571069d47e2931cdfd3e62b

commit | commitdiff | tree

Hansong Zhang [Thu, 1 Oct 2020 18:53:01 +0000 (18:53 +0000)]

BTA_AV: Unused variables am: 88c29c75de am: ca85d65a95 am: fc845d1bf5

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

Change-Id: Iac16b0e13897e62302d49b0c476826dd37545dbf

commit | commitdiff | tree

Hansong Zhang [Thu, 1 Oct 2020 18:52:59 +0000 (18:52 +0000)]

L2CA_SetFlushTimeout does nothing. am: 407d7fb54f am: 54b8ca40db am: b69df782ef

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

Change-Id: If3cecbf77ed2d069df4888b7779abc7e2fd8c823

commit | commitdiff | tree

Hansong Zhang [Thu, 1 Oct 2020 18:52:56 +0000 (18:52 +0000)]

L2cap: clean up flush timeout option am: d38a1018c7 am: 9723d8ca98 am: 6784106ecd

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

Change-Id: I4bf27f74f624c48d4a6c57dba69d2e717ebb8f58

commit | commitdiff | tree

Hansong Zhang [Thu, 1 Oct 2020 18:52:55 +0000 (18:52 +0000)]

BTA_AV: Unused variable am: a78a7f5bba am: 4d544d2180 am: 8260ef2c85

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

Change-Id: Ib81dc10645ff5da4d59492568c97679d5c9f1c5d

commit | commitdiff | tree

Hansong Zhang [Thu, 1 Oct 2020 18:52:52 +0000 (18:52 +0000)]

BTA_AV: Simplify flush timeout parameter am: 83db55569e am: 64503b3db7 am: 14e02435d1

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

Change-Id: I0f52e426dfa031d6327bdb5af351326900af5a41

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Thu, 1 Oct 2020 08:19:38 +0000 (08:19 +0000)]

L2cap: our cfg option never uses flush timeout am: 6606d192a4 am: 9e97957e6b am: cf1c6ca3b5

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

Change-Id: Ia03a652e85ffe3106e178de878f78d83199e808e

commit | commitdiff | tree

Treehugger Robot [Thu, 1 Oct 2020 08:18:25 +0000 (08:18 +0000)]

Merge "Use bta/sys/bta_sys::BtaIdSysText()" am: 56f4b403b2 am: 22ec3bb2c6 am: f3a148570e

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

Change-Id: I0bb399952f1a4b7df94bdd711bea5f18124159a5

commit | commitdiff | tree

Chris Manton [Thu, 1 Oct 2020 08:09:50 +0000 (08:09 +0000)]

Incoming ACL packets stop at acl layer first am: d9f3e3f18a am: 1e410a9b15 am: c05bcd6853

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

Change-Id: Ida2985907ba53371b4ae407b152b61980d2968b8

commit | commitdiff | tree

Chris Manton [Thu, 1 Oct 2020 08:09:45 +0000 (08:09 +0000)]

Re-log bta/../LOG_ am: eed7c58c64 am: bdf5a1f6cb am: 48f5c74b38

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

Change-Id: Icabbe287b0f2d40bf29259cd7f3e1d007da508e6

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 1 Oct 2020 03:06:17 +0000 (03:06 +0000)]

Merge "Use bta/sys/bta_sys::BtaIdSysText()"

system/bt

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.