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

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

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

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()"

commit | commitdiff | tree

Chris Manton [Wed, 30 Sep 2020 22:46:41 +0000 (15:46 -0700)]

Incoming ACL packets stop at acl layer first

Bug: 166280067
Tag: #refactor
Test: act.py -tc BleCocTest

Change-Id: Icbc0193a0db19c05f1edd5d4c3ea168819bae17b

commit | commitdiff | tree

Chris Manton [Fri, 4 Sep 2020 01:37:35 +0000 (18:37 -0700)]

Re-log bta/../LOG_

Towards readable logs

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

commit | commitdiff | tree

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

Merge "Add ACL shim event registration" am: 71202c6785 am: 37f641ad3e am: c1eb291af5

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

Change-Id: I1d0cabf995ec37ca2c894d854910360990b87c9a

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge changes I2f2c69a4,I41a65c6c,I101aa769,I87d34f49,Ifb5e07f6, ... am: c898e62148 am: 9c4d10bd32 am: 59a929bdf9

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

Change-Id: I5e99cb25ddeaf28f0bf0ef07ece678a2644ab958

commit | commitdiff | tree

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

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

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

Change-Id: If275b270455f625c4da1345f2d8f53decfe8a97e

commit | commitdiff | tree

Treehugger Robot [Wed, 30 Sep 2020 22:56:23 +0000 (22:56 +0000)]

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

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

Change-Id: I2b88f89e8fcfa3c16d92c006cb25889723830231

commit | commitdiff | tree

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

Merge "Add ACL shim event registration"

commit | commitdiff | tree

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

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

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

Change-Id: I07f570638846a4aa4ae9c5bb0da14b76de1f158b

commit | commitdiff | tree

Treehugger Robot [Wed, 30 Sep 2020 22:15:48 +0000 (22:15 +0000)]

Merge changes I2f2c69a4,I41a65c6c,I101aa769,I87d34f49,Ifb5e07f6, ...

* changes:
  Remove unnecessary declarations stack/btm/btm_sco
  Locally link and remove unused funcs stack/btm/btm_sco
  Re-log stack/btm/btm_ble_gap::btm_ble_update_inq_result
  Remove duplicate decls stack/btm/btm_int
  Locally link and remove unused funcs stack/btm/btm_inq
  Remove decl stack/btm/btm_int
  Locally link and remove unused funcs stack/btm/btm_devctl
  Locally link and remove unused funcs stack/btm/btm_ble_cont_energy
  Locally link and remove unused funcs stack/btm/btm_ble_adv_filter
  Locally link and remove unused funcs stack/btm/btm_ble_addr
  Remove unnecessary declarations stack/btm/btm_ble_int
  Remove duplicate decls
  Add bta/sys/bta_sys::BtaIdSysText()
  Re-log parts of btif/src/btif_storage
  Re-log parts of btif/src/btif_sock_thread
  Re-log btif/src/btif_sock_rfc::btsock_rfc_listen

commit | commitdiff | tree

Sal Savage [Wed, 30 Sep 2020 20:53:23 +0000 (20:53 +0000)]

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

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

Change-Id: I2a906d01dffd47fc510a7458df7e964027597aeb

commit | commitdiff | tree

Martin Brabham [Wed, 30 Sep 2020 20:53:02 +0000 (20:53 +0000)]

CertSecurity: Add missing events to registration am: 18de3f6cbe am: 5fd4e0be46 am: 9f4ffbcb89

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

Change-Id: Idddd3b6ab390652fdbd58d2e922dbac7c3c7ece9

commit | commitdiff | tree

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

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

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

Change-Id: Ifec42232d58f0b8f93625a8064febbb488741297

commit | commitdiff | tree

Martin Brabham [Wed, 30 Sep 2020 20:35:28 +0000 (20:35 +0000)]

CertSecurity: Add missing events to registration am: 18de3f6cbe am: 5fd4e0be46

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

Change-Id: Ic649528264f2235c33d3d4de417631a92fba9b59

commit | commitdiff | tree

Chris Manton [Mon, 28 Sep 2020 20:15:06 +0000 (13:15 -0700)]

Add ACL shim event registration

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

commit | commitdiff | tree

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

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

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

Change-Id: Id8033beb2c39ee10f8884b2027896cf58a16b8ab

commit | commitdiff | tree

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

CertSecurity: Add missing events to registration am: 18de3f6cbe

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

Change-Id: Iaafa9aabe77c5e97c6a7c057989d9d0f824dcab2

commit | commitdiff | tree

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

Merge "Properly update config when the MAC Address changes"

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 02:41:02 +0000 (19:41 -0700)]

Remove unnecessary declarations stack/btm/btm_sco

Towards readable code

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

commit | commitdiff | tree

Chris Manton [Wed, 30 Sep 2020 16:43:20 +0000 (09:43 -0700)]

Locally link and remove unused funcs stack/btm/btm_sco

Towards readable code

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

commit | commitdiff | tree

Chris Manton [Sat, 26 Sep 2020 23:24:26 +0000 (16:24 -0700)]

Re-log stack/btm/btm_ble_gap::btm_ble_update_inq_result

Towards loggable code

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

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 02:42:01 +0000 (19:42 -0700)]

Remove duplicate decls stack/btm/btm_int

Towards readable code

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

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 02:40:37 +0000 (19:40 -0700)]

Locally link and remove unused funcs stack/btm/btm_inq

Towards readable code

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

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 02:28:26 +0000 (19:28 -0700)]

Remove decl stack/btm/btm_int

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

Change-Id: Ie3915f1024cd82063534b9898fc60fa3eb776f10

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 02:27:54 +0000 (19:27 -0700)]

Locally link and remove unused funcs stack/btm/btm_devctl

Towards readable code

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

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 02:27:12 +0000 (19:27 -0700)]

Locally link and remove unused funcs stack/btm/btm_ble_cont_energy

Towards readable code

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

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 01:46:52 +0000 (18:46 -0700)]

Locally link and remove unused funcs stack/btm/btm_ble_adv_filter

Towards readable code

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

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 01:45:52 +0000 (18:45 -0700)]

Locally link and remove unused funcs stack/btm/btm_ble_addr

Towards readable code

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

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 01:33:06 +0000 (18:33 -0700)]

Remove unnecessary declarations stack/btm/btm_ble_int

Towards readable code

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

Change-Id: I53c769dff909d282c57e558f69086fe4fa670e35

commit | commitdiff | tree

Chris Manton [Sun, 20 Sep 2020 01:11:32 +0000 (18:11 -0700)]

Remove duplicate decls

Also in: stack/btm/btm_ble_int

Towards readable code

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

commit | commitdiff | tree

Chris Manton [Thu, 24 Sep 2020 06:11:30 +0000 (23:11 -0700)]

Add bta/sys/bta_sys::BtaIdSysText()

Towards loggable code

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

Change-Id: Ie2bde0d4b46e3721d8523fa9293ddbc97e4e1fd2

commit | commitdiff | tree

Chris Manton [Thu, 24 Sep 2020 18:18:41 +0000 (11:18 -0700)]

Re-log parts of btif/src/btif_storage

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I2d2a3a44037a132f2361acb36d039e9d8c757c8d

commit | commitdiff | tree

Chris Manton [Thu, 24 Sep 2020 18:17:57 +0000 (11:17 -0700)]

Re-log parts of btif/src/btif_sock_thread

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: I455eba51f92a8185997fefc88fad4bfffc36cd0e

commit | commitdiff | tree

Chris Manton [Thu, 24 Sep 2020 18:16:55 +0000 (11:16 -0700)]

Re-log btif/src/btif_sock_rfc::btsock_rfc_listen

Towards loggable code

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Change-Id: Ie7839827710efa59e6181fd34cc7d1e4a3aad3cd

commit | commitdiff | tree

Chris Manton [Wed, 30 Sep 2020 18:59:34 +0000 (18:59 +0000)]

L2cap CoC callback use Confirm not Ind on server am: 5ba9d7c05d am: 8bb2a9a2c7 am: 8384bb875b

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

Change-Id: I928957d2f306cda19a00591f2272c3166bffd232

commit | commitdiff | tree

Chris Manton [Wed, 30 Sep 2020 18:41:15 +0000 (18:41 +0000)]

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

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

Change-Id: I889f4ab688d32d87f134cac96dde5b46a6e5639d

commit | commitdiff | tree

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

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

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

Change-Id: I5329aca4e6c6068815f9669ddea4ce92038b38ef

commit | commitdiff | tree

Martin Brabham [Tue, 29 Sep 2020 23:34:05 +0000 (16:34 -0700)]

CertSecurity: Add missing events to registration

Bug: 169707911
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Change-Id: Id28bcad19a0ee58e5127b47f52a6935d96bd6c67

commit | commitdiff | tree

Chris Manton [Wed, 30 Sep 2020 04:26:24 +0000 (21:26 -0700)]

L2cap CoC callback use Confirm not Ind on server

Confirm is nullptr on L2cap connect-only-services

Bug: 169725013
Test: act.py -tc BleCocTest
Tag: #refactor
Change-Id: I5c87923a2b721c3d5b87d52969552382a5b1d633

commit | commitdiff | tree

Dan Shi [Wed, 30 Sep 2020 01:06:26 +0000 (01:06 +0000)]

Remove net_test_bta from TEST_MAPPING file am: 00bb094b4e am: 56f4bd0c5d am: b465fd33fd

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

Change-Id: I10cacfa37a6cc7f60dc8726a7cdabeed6c3a1a0f

commit | commitdiff | tree

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

Remove net_test_bta from TEST_MAPPING file am: 00bb094b4e am: 56f4bd0c5d

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

Change-Id: I82cefc91f9cf1f01d011e7860232f86579e542be

commit | commitdiff | tree

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

Remove net_test_bta from TEST_MAPPING file am: 00bb094b4e

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

Change-Id: I0c582d20c422a26ed78feb1d57cc3dd9b61bdf3b

commit | commitdiff | tree

Dan Shi [Tue, 29 Sep 2020 23:31:48 +0000 (16:31 -0700)]

Remove net_test_bta from TEST_MAPPING file

The test is device only test.

Bug: 169705178
Test: none
Change-Id: I19b6fdf5ff5e197380f5406563903f685e7a3d78

commit | commitdiff | tree

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

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

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

Change-Id: Id03b6cec735d9c29107e1f52638e1c5fb5d8cc9b

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Sep 2020 19:43:49 +0000 (19:43 +0000)]

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

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

Change-Id: I12961461ebc4829a74dcefc2f12aa0dd60ae8704

commit | commitdiff | tree

Sal Savage [Tue, 29 Sep 2020 19:01:45 +0000 (12:01 -0700)]

Properly update config when the MAC Address changes

The existing code has two issues:
- We pass a 0 size value for the buffer we intend to contain the value
we're getting. This causes btif_config_get_str to always return
positively but never write a value because its usage of srtlcpy doesn't
think it has space to write.
- We check to see if the address in the config is the same as the one
received from the controller using (strcmp(...) == 0). However, strcmp
returns 0 if they are the same. It will be a non-zero value if they are
different.

Following this change, the bt_config.conf file should have the correct
value for the MAC Address in the case the controller interface starts
reporting something new.

Bug: 169686820
Test: setprop persist.vendor.service.bdroid.bdaddr <something new>; cat
/data/misc/bluedroid/bt_config.conf | grep Address;

Change-Id: I6cdb70776fef689426baf58be0ccaf4abe9c9023

system/bt

RSS Atom

About OSDN

Find Software

Develop Software

Help