Replace tBTA_LE_KEY_TYPE=>tBTM_LE_KEY_TYPE am: 9ef98020f1

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

Change-Id: Id8ee2396961663244c7b1de5ff6f5f5a8536eb3c

Simplify StackAclBtmAcl::btm_bda_to_acl am: f52496654c

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

Change-Id: I2faf3cf4bac158baff419262060e9aee98bb6b4c

Internally link stack/acl/btm_acl::btm_ble_get_acl_remote_addr am: 95772843cb

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

Change-Id: I4760a7d62ed76c895b14df6b8f5e44739428d02c

Replace tBTA_LE_KEY_TYPE=>tBTM_LE_KEY_TYPE

Towards the shortest path

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

Change-Id: I9475559159475f9f9d81a921cf14c2db62be3839

Simplify StackAclBtmAcl::btm_bda_to_acl

Towards proper interfaces

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

Change-Id: I6573f60cbf5e469fe780c6d5a4506c0dcd39f590

Internally link stack/acl/btm_acl::btm_ble_get_acl_remote_addr

Towards readable code

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

Change-Id: Id440b966613aaeb4b39ece7d4517a5158e823456

Merge "Remove init flags log message, you can check the dumpsys now" am: 30ddaf173d

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

Change-Id: I1e2e8cf1fb6c20d6e24f6cab2d3d27e4fbf0cff3

Merge "Remove init flags log message, you can check the dumpsys now"

Merge "Add A2DP/SDP fuzzers for bt-stack" am: 925f1f4d8f

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

Change-Id: Id3eddc0b0d7fe1dc4977fea3dd4926f524cec74f

Merge "Add A2DP/SDP fuzzers for bt-stack"

enum-ify tgatt_status am: 80b80d3ec8

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

Change-Id: I967861e2eecdd4f7ee532b65d66e6986a92318c2

Include security_device_record stack/acl/btm_acl am: 483c5d9a21

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

Change-Id: I51cfa6a5703bee6f5db3ad2eb2c417d3ab2f8715

Remove unused defs BTM_ACL_PKT_TYPES_MASK_ am: e937ff70f0

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

Change-Id: Ie046295b529c989f9ffbe4d4b8abd662ec84b3b3

enum-ify tgatt_status

Towards readable code

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

Change-Id: I44a41dfbf11c1bbca77c8f568ed1ada236476d6f

Include security_device_record stack/acl/btm_acl

Towards readable code

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

Change-Id: I3b2ed7bd82dff9b504223aa9ea93a72a1c0575b7

Remove unused defs BTM_ACL_PKT_TYPES_MASK_

Towards readable code

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

Change-Id: I59f2004e5450834dcdc725f52942923aa5294fe4

log tgatt status properly am: d5e1f52c7a

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

Change-Id: If02db583f1e7eac5e462a35403f2dcb6d3baeb0f

encapsulate tBTM_BOND_TYPE within tBTM_SEC_DEV_REC am: 52ac9da327

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

Change-Id: I54207f965ae34176312cc0bf10f581c1f9e54a32

Properly add typedef for gatt status am: 0fb7cc4885

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

Change-Id: Iaebf9ecfbcd5eb72c58ff5059b503ee32174ac5f

log tgatt status properly

Towards readable code

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

Change-Id: I5e4c526baca73a3c4e5e64a4b4bea4daab31116a

encapsulate tBTM_BOND_TYPE within tBTM_SEC_DEV_REC

Towards readable code

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

Properly add typedef for gatt status

Towards readable code

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

Change-Id: I058946087572442b26a42e36076db273076c7518

Merge "GD Security: Fix bad conditional" am: 23bc14bf07

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

Change-Id: Ia4172485560ae29acde720f8e315ed41a362aadd

Merge "GD Security: Fix bad conditional"

Add include stack/smp/smp_act::smp_api_types.h am: a5d60f57d9

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

Change-Id: I3ec6758f631ca8586b0896118100190470264369

Encapulate tBTM_SEC_DEV_REC::pin_code_length am: c0358734f2

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

Change-Id: Ib1160bd01dc559b829b62f2823d639b184fcc580

Wrap API around tBTM_SEC_DEV_REC::BTM_SEC_ am: 99d84b1f8b

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

Change-Id: I0ecfce444a8d0738fde2ff9177348aa81dbffa02

Re-log btif/src/btif_sdp_server:: am: 2d423fbf1d

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

Change-Id: I02a280c1869ad6e0c109dbe272471f9591992242

Remove unused decls stack/btm/btm_int am: ef095485d2

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

Change-Id: I9290826abfe601ad31ea35125a0d11eb48d50c27

enum-ify BTM_SEC_ and BTM_SEC_LE am: 6a231f9b75

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

Change-Id: I4218c4dc168fb954f2e41a76243f12470cc9680b

Remove unused var tBTM_CB::state_temp_buffer am: ea115fe4f9

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

Change-Id: If0893c1acdc32b705f1079baabe3df8846e62fb7

Encapsulate tBTM_CB::btm_scn am: d6e3ce8d7b

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

Change-Id: I8ab322ab8de370a948d02c013f7ed653a9da75b1

Encapsulate tBTM_CB::enc_rand, ediv, key_size am: 829451f652

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

Change-Id: I9dfdee968a86275055b72df5080e69859bc977e2

Encapsulate tBTM_CB::enc_handle am: ddf998bdd8

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

Change-Id: I33c4b30837443b28da57fd176c3bb6bac5a7a917

L2CA_SetFlushTimeout does nothing. am: 928e707151

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

Change-Id: I94343d6e59b0f43f2ae2ad816c2ac5635fb8bb5b

Re-align read remote version information on legacy am: 2c0a6c7825

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

Change-Id: Id708d38839dbf2d8e7187f24930aefc2bd4f6acb

GD Security: Fix bad conditional

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Change-Id: I87bb3ac3ae7ccfc8164cf8565eb1e88f2f44e2d6

Add include stack/smp/smp_act::smp_api_types.h

Include what you use

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I1de6caf318d75776ac2dbc5456ea32e287622d39

Encapulate tBTM_SEC_DEV_REC::pin_code_length

Towards readable code

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

Wrap API around tBTM_SEC_DEV_REC::BTM_SEC_

Towards readable code

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

Re-log btif/src/btif_sdp_server::

Towards loggable code

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

Remove unused decls stack/btm/btm_int

Towards readable code

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

enum-ify BTM_SEC_ and BTM_SEC_LE

Towards readable code

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

Remove unused var tBTM_CB::state_temp_buffer

Towards readable code

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

Encapsulate tBTM_CB::btm_scn

Towards readable code

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

Encapsulate tBTM_CB::enc_rand, ediv, key_size

Towards readable code

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

Encapsulate tBTM_CB::enc_handle

Towards readable code

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

L2CA_SetFlushTimeout does nothing.

aosp/1443546

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

Re-align read remote version information on legacy

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

Change-Id: I7be1ecba73234431194ad9702ec3ea06b09c60bc

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

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

Change-Id: I2bb6be2e34529f6df81a531dc4ed7e86f614b18e

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

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

Merge "Convert mask types from uint32_t to enum type"

SMP: Assume L2cap tx completes immediately am: 8326b49c4c

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

Change-Id: I257fd78f2b5413d0858ccd3f1c073297e61f70bd

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

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

Change-Id: I41fe290dec074238a22c01100afd664640ffed16

Link flush timeout is unused am: 12a0975cd7

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

Change-Id: Ie633a77db877c5e3e99528680b790fd886f90cd6

SMP: Assume L2cap tx completes immediately

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

L2cap: LE address type is not used

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

Link flush timeout is unused

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

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

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

Change-Id: I75f73aead0b8661c7897b222c77077e84d572477

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

Precise naming match => is_in_security_db

Towards readable code

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

enum-ify _SCAN both classic and ble

Towards readable code

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

enum-ify _INQUIRY both classic and ble

Towards readable code

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

enum-ify _CONNECTABLE both classic and ble

Towards readable code

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

enum-ify _DISCOVERABLE both classic and ble

Towards readable code

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

HIDH: Don't set a minimum MTU

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

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

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

Change-Id: Id5691b65ae6198a10f33791dce20775d8b72f43d

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

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

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

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

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

Change-Id: I3017c883fce238567ddb4bcac940962e6633e720

Merge "Store LE device keys when bonded"

Merge "HIDH: Register for HID_PSM_CONTROL" am: 0978770013

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

Change-Id: Ia0290a8bed8f07f510717f1fcb66548cf545d65e

Merge "HIDH: Register for HID_PSM_CONTROL"

Merge "Revert "Add ACL shim event registration"" am: 467dd9cb60

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

Change-Id: I77b17f765429cef715a9888dca7b377664d531fd

Merge "Revert "Add ACL shim event registration""

HIDH: Register for HID_PSM_CONTROL

Bug: 169780397
Test: Pair with a classic HID device
Tag: #gd-refactor
Change-Id: I22fa725c2665282b2c246256c838fdbc8bc05549

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

Clean up unused avdt definitions am: f7cb243d3c

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

Change-Id: I89a587492da156483f685a66b49480dabe00e38f

Revert "Add ACL shim event registration"

Test: Compiles
Bug: 166280067
Tag: #refactor

This reverts commit a6b323be6e84c6fb0e986b73a8555314044618ab.

Change-Id: I99b4f8b8fa7118cd2754477209b8e81916cb4811

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

Clean up unused avdt definitions

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

Merge changes from topic "gd_security_shim" am: c0b890c4f9

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

Change-Id: I4560689aa7a0b593c1ef99b54e6fb322fe8ca199

Merge changes from topic "gd_security_shim"

* changes:
  BTM Shim: Put/Get information bits to ConfirmationData
  Introduce ConfirmationData

BTA_AV: Unused variables am: 88c29c75de

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

Change-Id: I2fab2416f6e57515f4f2736c32c6f482e9653b16

L2CA_SetFlushTimeout does nothing. am: 407d7fb54f

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

Change-Id: I2c61e4fe9876083f8c7b777885a4838be3299e5f

L2cap: clean up flush timeout option am: d38a1018c7

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

Change-Id: I0128d6adaf179e083fc001489c134f717f868ec9

BTA_AV: Unused variable am: a78a7f5bba

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

Change-Id: I57ce28351d459d66b8266c14abbdca6ab72489b8

BTA_AV: Simplify flush timeout parameter am: 83db55569e

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

Change-Id: If5af90be05749f2dead9c05594bcb9f5de294fbb

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

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

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

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

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

Change-Id: Id1718b0e7055453025e8bd4810279644d8c16693

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

Re-log bta/../LOG_ am: eed7c58c64

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

Change-Id: Iaaa87f772fa6ae6b03ec317636ab582dcbda3f69

BTA_AV: Unused variables

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

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

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

BTA_AV: Unused variable

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