OSDN Git Service

android-x86/system-bt.git
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

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

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

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

3 years agoMerge changes I2f2c69a4,I41a65c6c,I101aa769,I87d34f49,Ifb5e07f6, ...
Treehugger Robot [Wed, 30 Sep 2020 22:15:48 +0000 (22:15 +0000)]
Merge changes I2f2c69a4,I41a65c6c,I101aa769,I87d34f49,Ifb5e07f6, ...

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

3 years agoMerge "Properly update config when the MAC Address changes" am: eaa91905c1 am: e87e77d590
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

3 years agoCertSecurity: Add missing events to registration am: 18de3f6cbe am: 5fd4e0be46
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

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

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

3 years agoMerge "Properly update config when the MAC Address changes" am: eaa91905c1
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

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

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

3 years agoRemove unnecessary declarations stack/btm/btm_sco
Chris Manton [Sun, 20 Sep 2020 02:41:02 +0000 (19:41 -0700)]
Remove unnecessary declarations stack/btm/btm_sco

Towards readable code

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

3 years agoLocally link and remove unused funcs stack/btm/btm_sco
Chris Manton [Wed, 30 Sep 2020 16:43:20 +0000 (09:43 -0700)]
Locally link and remove unused funcs stack/btm/btm_sco

Towards readable code

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

3 years agoRe-log stack/btm/btm_ble_gap::btm_ble_update_inq_result
Chris Manton [Sat, 26 Sep 2020 23:24:26 +0000 (16:24 -0700)]
Re-log stack/btm/btm_ble_gap::btm_ble_update_inq_result

Towards loggable code

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

3 years agoRemove duplicate decls stack/btm/btm_int
Chris Manton [Sun, 20 Sep 2020 02:42:01 +0000 (19:42 -0700)]
Remove duplicate decls stack/btm/btm_int

Towards readable code

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

3 years agoLocally link and remove unused funcs stack/btm/btm_inq
Chris Manton [Sun, 20 Sep 2020 02:40:37 +0000 (19:40 -0700)]
Locally link and remove unused funcs stack/btm/btm_inq

Towards readable code

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

3 years agoRemove decl stack/btm/btm_int
Chris Manton [Sun, 20 Sep 2020 02:28:26 +0000 (19:28 -0700)]
Remove decl stack/btm/btm_int

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

Change-Id: Ie3915f1024cd82063534b9898fc60fa3eb776f10

3 years agoLocally link and remove unused funcs stack/btm/btm_devctl
Chris Manton [Sun, 20 Sep 2020 02:27:54 +0000 (19:27 -0700)]
Locally link and remove unused funcs stack/btm/btm_devctl

Towards readable code

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

3 years agoLocally link and remove unused funcs stack/btm/btm_ble_cont_energy
Chris Manton [Sun, 20 Sep 2020 02:27:12 +0000 (19:27 -0700)]
Locally link and remove unused funcs stack/btm/btm_ble_cont_energy

Towards readable code

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

3 years agoLocally link and remove unused funcs stack/btm/btm_ble_adv_filter
Chris Manton [Sun, 20 Sep 2020 01:46:52 +0000 (18:46 -0700)]
Locally link and remove unused funcs stack/btm/btm_ble_adv_filter

Towards readable code

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

3 years agoLocally link and remove unused funcs stack/btm/btm_ble_addr
Chris Manton [Sun, 20 Sep 2020 01:45:52 +0000 (18:45 -0700)]
Locally link and remove unused funcs stack/btm/btm_ble_addr

Towards readable code

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

3 years agoRemove unnecessary declarations stack/btm/btm_ble_int
Chris Manton [Sun, 20 Sep 2020 01:33:06 +0000 (18:33 -0700)]
Remove unnecessary declarations stack/btm/btm_ble_int

Towards readable code

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

Change-Id: I53c769dff909d282c57e558f69086fe4fa670e35

3 years agoRemove duplicate decls
Chris Manton [Sun, 20 Sep 2020 01:11:32 +0000 (18:11 -0700)]
Remove duplicate decls

Also in: stack/btm/btm_ble_int

Towards readable code

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

3 years agoAdd bta/sys/bta_sys::BtaIdSysText()
Chris Manton [Thu, 24 Sep 2020 06:11:30 +0000 (23:11 -0700)]
Add bta/sys/bta_sys::BtaIdSysText()

Towards loggable code

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

Change-Id: Ie2bde0d4b46e3721d8523fa9293ddbc97e4e1fd2

3 years agoRe-log parts of btif/src/btif_storage
Chris Manton [Thu, 24 Sep 2020 18:18:41 +0000 (11:18 -0700)]
Re-log parts of btif/src/btif_storage

Towards loggable code

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

3 years agoRe-log parts of btif/src/btif_sock_thread
Chris Manton [Thu, 24 Sep 2020 18:17:57 +0000 (11:17 -0700)]
Re-log parts of btif/src/btif_sock_thread

Towards loggable code

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

3 years agoRe-log btif/src/btif_sock_rfc::btsock_rfc_listen
Chris Manton [Thu, 24 Sep 2020 18:16:55 +0000 (11:16 -0700)]
Re-log btif/src/btif_sock_rfc::btsock_rfc_listen

Towards loggable code

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

3 years agoL2cap CoC callback use Confirm not Ind on server am: 5ba9d7c05d am: 8bb2a9a2c7
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

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

3 years agoCertSecurity: Add missing events to registration
Martin Brabham [Tue, 29 Sep 2020 23:34:05 +0000 (16:34 -0700)]
CertSecurity: Add missing events to registration

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

3 years agoL2cap CoC callback use Confirm not Ind on server
Chris Manton [Wed, 30 Sep 2020 04:26:24 +0000 (21:26 -0700)]
L2cap CoC callback use Confirm not Ind on server

Confirm is nullptr on  L2cap connect-only-services

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

3 years agoRemove net_test_bta from TEST_MAPPING file am: 00bb094b4e am: 56f4bd0c5d
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

3 years agoRemove net_test_bta from TEST_MAPPING file am: 00bb094b4e
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

3 years agoRemove net_test_bta from TEST_MAPPING file
Dan Shi [Tue, 29 Sep 2020 23:31:48 +0000 (16:31 -0700)]
Remove net_test_bta from TEST_MAPPING file

The test is device only test.

Bug: 169705178
Test: none
Change-Id: I19b6fdf5ff5e197380f5406563903f685e7a3d78

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

3 years agoProperly update config when the MAC Address changes
Sal Savage [Tue, 29 Sep 2020 19:01:45 +0000 (12:01 -0700)]
Properly update config when the MAC Address changes

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

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

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

Change-Id: I6cdb70776fef689426baf58be0ccaf4abe9c9023

3 years agoMerge changes Iefb88b7e,Ia8fd678c,Ieefd35fa,Ib474f0be,I16606384, ... am: a560910b82
Treehugger Robot [Tue, 29 Sep 2020 19:16:31 +0000 (19:16 +0000)]
Merge changes Iefb88b7e,Ia8fd678c,Ieefd35fa,Ib474f0be,I16606384, ... am: a560910b82

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

Change-Id: Ibc2228c57c300aecf3b6cb478af3641cb484202c

3 years agoMerge changes Iefb88b7e,Ia8fd678c,Ieefd35fa,Ib474f0be,I16606384, ...
Treehugger Robot [Tue, 29 Sep 2020 18:46:09 +0000 (18:46 +0000)]
Merge changes Iefb88b7e,Ia8fd678c,Ieefd35fa,Ib474f0be,I16606384, ...

* changes:
  Re-log btif/src/btif_dm::btif_dm_cancel_discovery
  Re-log btif/src/btif_dm::btif_dm_search_services_evt
  Re-log btif/src/btif_dm::btif_update_remote_properties
  Re-log btif/src/btif_dm::bond_state_changed
  Re-log btif/src/btif_core::btif_enable_bluetooth_evt
  Re-log btif_get____type
  Log proper btif/src/btif_bqr::ConfigureBqr
  Re-log btif/src/btif_av::btif_av_get_peer_sep
  Re-log btif/src/btif_a2dp::btif_a2dp_on_idle
  Restore Le transport for SetPhy function

3 years agoMerge "Reject SetBrowsedPlayer if there is not browsable player" am: e5004b17be am...
Treehugger Robot [Tue, 29 Sep 2020 18:33:05 +0000 (18:33 +0000)]
Merge "Reject SetBrowsedPlayer if there is not browsable player" am: e5004b17be am: edc817f5ed

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

Change-Id: Id1bf2448f3ab3d48d5e273f06b961d44796b5a04

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

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

Change-Id: I72c072a63ce1e554053016e39a7596bb40cfcccc

3 years agoL2cap shim: Add mtu requirement to config option am: e7a8457e3c am: 9594400deb
Hansong Zhang [Tue, 29 Sep 2020 17:40:45 +0000 (17:40 +0000)]
L2cap shim: Add mtu requirement to config option am: e7a8457e3c am: 9594400deb

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

Change-Id: I9834af0b2c82e4c14fe9693ae6b2347525c88049

3 years agoMerge "GAP: Support 128-bit custom UUID in EIR record" am: 431af678ec am: 1d23739390
Alain Vongsouvanh [Tue, 29 Sep 2020 17:40:16 +0000 (17:40 +0000)]
Merge "GAP: Support 128-bit custom UUID in EIR record" am: 431af678ec am: 1d23739390

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

Change-Id: I254f9e2102a1cf582dadfbd0893932d62dc00171

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

3 years agoL2cap shim: Add mtu requirement to config option am: e7a8457e3c
Hansong Zhang [Tue, 29 Sep 2020 17:19:46 +0000 (17:19 +0000)]
L2cap shim: Add mtu requirement to config option am: e7a8457e3c

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

Change-Id: Id75d31be9b610a1cd0f10de0be3f08339889b151

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

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

Change-Id: Iba63cca19d976d004b2a46e4f4e2d1e450219373

3 years agoL2cap shim: Add mtu requirement to config option
Hansong Zhang [Tue, 29 Sep 2020 04:56:13 +0000 (21:56 -0700)]
L2cap shim: Add mtu requirement to config option

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

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

3 years agoRe-log btif/src/btif_dm::btif_dm_cancel_discovery
Chris Manton [Thu, 24 Sep 2020 18:11:17 +0000 (11:11 -0700)]
Re-log btif/src/btif_dm::btif_dm_cancel_discovery

Towards loggable code

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

3 years agoRe-log btif/src/btif_dm::btif_dm_search_services_evt
Chris Manton [Thu, 24 Sep 2020 18:10:07 +0000 (11:10 -0700)]
Re-log btif/src/btif_dm::btif_dm_search_services_evt

Towards loggable code

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

3 years agoRe-log btif/src/btif_dm::btif_update_remote_properties
Chris Manton [Thu, 24 Sep 2020 18:06:29 +0000 (11:06 -0700)]
Re-log btif/src/btif_dm::btif_update_remote_properties

Towards loggable code

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

3 years agoRe-log btif/src/btif_dm::bond_state_changed
Chris Manton [Thu, 24 Sep 2020 18:03:05 +0000 (11:03 -0700)]
Re-log btif/src/btif_dm::bond_state_changed

Towards loggable code

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

3 years agoRe-log btif/src/btif_core::btif_enable_bluetooth_evt
Chris Manton [Thu, 24 Sep 2020 18:01:59 +0000 (11:01 -0700)]
Re-log btif/src/btif_core::btif_enable_bluetooth_evt

Towards loggable code

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

3 years agoRe-log btif_get____type
Chris Manton [Thu, 24 Sep 2020 17:58:38 +0000 (10:58 -0700)]
Re-log btif_get____type

Towards loggable code

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

3 years agoLog proper btif/src/btif_bqr::ConfigureBqr
Chris Manton [Thu, 24 Sep 2020 17:57:39 +0000 (10:57 -0700)]
Log proper btif/src/btif_bqr::ConfigureBqr

Towards loggable code

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

3 years agoRe-log btif/src/btif_av::btif_av_get_peer_sep
Chris Manton [Thu, 24 Sep 2020 17:56:31 +0000 (10:56 -0700)]
Re-log btif/src/btif_av::btif_av_get_peer_sep

Towards loggable code

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

3 years agoRe-log btif/src/btif_a2dp::btif_a2dp_on_idle
Chris Manton [Thu, 24 Sep 2020 17:54:11 +0000 (10:54 -0700)]
Re-log btif/src/btif_a2dp::btif_a2dp_on_idle

Towards loggable code

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

3 years agoRestore Le transport for SetPhy function
Chris Manton [Fri, 25 Sep 2020 19:53:32 +0000 (12:53 -0700)]
Restore Le transport for SetPhy function

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

3 years agoGD L2cap: Add a way to enforce required mtu am: 189816c3fe am: 693af8fda2
Hansong Zhang [Tue, 29 Sep 2020 03:37:26 +0000 (03:37 +0000)]
GD L2cap: Add a way to enforce required mtu am: 189816c3fe am: 693af8fda2

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

Change-Id: I17fc64e31b6742ba982a1168fa0c4c18f21b2466

3 years agoGAP_ConnOpen code minor clean up am: 21632e0b62 am: ba209a3226
Hansong Zhang [Tue, 29 Sep 2020 03:37:23 +0000 (03:37 +0000)]
GAP_ConnOpen code minor clean up am: 21632e0b62 am: ba209a3226

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

Change-Id: I8a48f4a37e859a14611daa3f6b43116d0b3b6704

3 years agoLE COC: Indicate channel open on ConnectRsp recv am: 6613113056 am: 3761a6e954
Hansong Zhang [Tue, 29 Sep 2020 03:37:19 +0000 (03:37 +0000)]
LE COC: Indicate channel open on ConnectRsp recv am: 6613113056 am: 3761a6e954

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

Change-Id: Ic815acb594d8b9ce89ed7ce42fa7ae4392bfaf74

3 years agoGD L2cap: Add a way to enforce required mtu am: 189816c3fe
Hansong Zhang [Tue, 29 Sep 2020 03:15:00 +0000 (03:15 +0000)]
GD L2cap: Add a way to enforce required mtu am: 189816c3fe

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

Change-Id: I3363747b6e168478947a779af20cfd333fdb5e03

3 years agoGAP_ConnOpen code minor clean up am: 21632e0b62
Hansong Zhang [Tue, 29 Sep 2020 03:14:56 +0000 (03:14 +0000)]
GAP_ConnOpen code minor clean up am: 21632e0b62

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

Change-Id: Ie66737d784407cb87c200c9786d00c0ccbf6730a

3 years agoLE COC: Indicate channel open on ConnectRsp recv am: 6613113056
Hansong Zhang [Tue, 29 Sep 2020 03:14:16 +0000 (03:14 +0000)]
LE COC: Indicate channel open on ConnectRsp recv am: 6613113056

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

Change-Id: I81c978939c6bf1bd34b1218db58140696a76b0d4

3 years agoMerge "Call EXPECT_CALL before the incoming event" am: e4bfe75a30 am: cd9aa2e6c3
Treehugger Robot [Tue, 29 Sep 2020 01:09:55 +0000 (01:09 +0000)]
Merge "Call EXPECT_CALL before the incoming event" am: e4bfe75a30 am: cd9aa2e6c3

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

Change-Id: I46934f3c297005b19a59e6a52097b6ec50e3379b

3 years agoMerge "SM: Implement name request during Classic pairing" am: d165f580d1 am: c89db9cc3f
Treehugger Robot [Tue, 29 Sep 2020 01:09:49 +0000 (01:09 +0000)]
Merge "SM: Implement name request during Classic pairing" am: d165f580d1 am: c89db9cc3f

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

Change-Id: I365ccc65919fda56d7e2b2b4cc1464d0166d4b11

3 years agoGD L2cap: Add a way to enforce required mtu
Hansong Zhang [Mon, 28 Sep 2020 23:11:45 +0000 (16:11 -0700)]
GD L2cap: Add a way to enforce required mtu

Test: cert/run --host
Tag: #gd-refactor
Bug: 141555841
Change-Id: Iefe65f3105ced94a9e653d82a59e550687765df2