OSDN Git Service

android-x86/system-bt.git
3 years agoEnsure we do not send A2DP data to non-active stream devices
Rahul Sabnis [Tue, 18 May 2021 22:16:03 +0000 (15:16 -0700)]
Ensure we do not send A2DP data to non-active stream devices

Tag: #feature
Bug: 187157598
Test: Manual
Merged-In: I4a251f74439e1c74fe6178bafd306c75cd6847e0
Change-Id: I4a251f74439e1c74fe6178bafd306c75cd6847e0

3 years agoMerge changes Ib557fbea,I25bb743c,I99f2584c,I852e9427,Iecae9ca5 am: a69349e3ad am...
Chris Manton [Wed, 5 May 2021 00:37:11 +0000 (00:37 +0000)]
Merge changes Ib557fbea,I25bb743c,I99f2584c,I852e9427,Iecae9ca5 am: a69349e3ad am: 6e93925448 am: 27fc3bd27e

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

Change-Id: Ia0ce4a29b02277d74cf3f6d1127e818206b3e7c7

3 years agoMerge changes Ib557fbea,I25bb743c,I99f2584c,I852e9427,Iecae9ca5 am: a69349e3ad am...
Chris Manton [Wed, 5 May 2021 00:19:00 +0000 (00:19 +0000)]
Merge changes Ib557fbea,I25bb743c,I99f2584c,I852e9427,Iecae9ca5 am: a69349e3ad am: 6e93925448

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

Change-Id: I3cab4a4e0394419b687be3339b2c0505362fce89

3 years agoMerge changes Ib557fbea,I25bb743c,I99f2584c,I852e9427,Iecae9ca5 am: a69349e3ad
Chris Manton [Tue, 4 May 2021 23:59:03 +0000 (23:59 +0000)]
Merge changes Ib557fbea,I25bb743c,I99f2584c,I852e9427,Iecae9ca5 am: a69349e3ad

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

Change-Id: I002252b6ddbf8e17bdfba8133950fb20cbccd0c9

3 years agoMerge changes Ib557fbea,I25bb743c,I99f2584c,I852e9427,Iecae9ca5
Chris Manton [Tue, 4 May 2021 23:31:54 +0000 (23:31 +0000)]
Merge changes Ib557fbea,I25bb743c,I99f2584c,I852e9427,Iecae9ca5

* changes:
  Use gatt_client_event_text convention for logging
  shim: Add l2cap per-channel network transfer metrics
  shim: Add hid profile to dumpsys
  Add stack/gatt::gatt_channel_state_text
  Add stack/gatt::gatt_security_action_text

3 years agoMerge "Parse scan_data_resp of advertisement tracking event correctly" am: 08f674c623...
Myles Watson [Tue, 4 May 2021 23:13:29 +0000 (23:13 +0000)]
Merge "Parse scan_data_resp of advertisement tracking event correctly" am: 08f674c623 am: 35f284f82d am: 55989005cc

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

Change-Id: I56be5fe28b2186d959ac385c8099bfae142d6d99

3 years agoMerge "Parse scan_data_resp of advertisement tracking event correctly" am: 08f674c623...
Myles Watson [Tue, 4 May 2021 22:54:21 +0000 (22:54 +0000)]
Merge "Parse scan_data_resp of advertisement tracking event correctly" am: 08f674c623 am: 35f284f82d

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

Change-Id: I5076439eadd56dcb92a6e7397ef6d10fa042ba5a

3 years agoMerge changes I12391f4e,I3bdf0ea0,I10ff16d7,I58caec1f am: 0a9ce6af0e am: 70e155502e...
Sonny Sasaka [Tue, 4 May 2021 22:34:00 +0000 (22:34 +0000)]
Merge changes I12391f4e,I3bdf0ea0,I10ff16d7,I58caec1f am: 0a9ce6af0e am: 70e155502e am: 58e07193ac

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

Change-Id: I10772b1c44e5f3816f41df04a58a03b3d8954b42

3 years agoMerge "Parse scan_data_resp of advertisement tracking event correctly" am: 08f674c623
Myles Watson [Tue, 4 May 2021 22:32:13 +0000 (22:32 +0000)]
Merge "Parse scan_data_resp of advertisement tracking event correctly" am: 08f674c623

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

Change-Id: I8f6f90b0b6d420e1fa14584f48e3579735b0817d

3 years agoMerge "Parse scan_data_resp of advertisement tracking event correctly"
Myles Watson [Tue, 4 May 2021 22:15:41 +0000 (22:15 +0000)]
Merge "Parse scan_data_resp of advertisement tracking event correctly"

3 years agoMerge changes I12391f4e,I3bdf0ea0,I10ff16d7,I58caec1f am: 0a9ce6af0e am: 70e155502e
Sonny Sasaka [Tue, 4 May 2021 22:06:49 +0000 (22:06 +0000)]
Merge changes I12391f4e,I3bdf0ea0,I10ff16d7,I58caec1f am: 0a9ce6af0e am: 70e155502e

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

Change-Id: I4aa9415392cc485331dc7dee6b47c4c82af7e93d

3 years agoMerge changes I12391f4e,I3bdf0ea0,I10ff16d7,I58caec1f am: 0a9ce6af0e
Sonny Sasaka [Tue, 4 May 2021 21:46:03 +0000 (21:46 +0000)]
Merge changes I12391f4e,I3bdf0ea0,I10ff16d7,I58caec1f am: 0a9ce6af0e

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

Change-Id: If39b2bc754d21b1d4dc1ac258a36cb4a0c21cac8

3 years agoMerge changes I12391f4e,I3bdf0ea0,I10ff16d7,I58caec1f
Sonny Sasaka [Tue, 4 May 2021 21:22:50 +0000 (21:22 +0000)]
Merge changes I12391f4e,I3bdf0ea0,I10ff16d7,I58caec1f

* changes:
  Add D-Bus daemon binary
  Add `dbus_projection` crate
  Add the `btstack` crate
  Add topshim for bluetooth interface

3 years agoMerge "OOB: Add public address to OOB data" am: 6107593afb am: 3d32a225dd am: da435a0868
Martin Brabham [Tue, 4 May 2021 20:45:48 +0000 (20:45 +0000)]
Merge "OOB: Add public address to OOB data" am: 6107593afb am: 3d32a225dd am: da435a0868

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

Change-Id: I2f835f3b05fd9bfb59945dd8cfd8bb9cfb693f90

3 years agoMerge "Add rust binaries to link with C++ staticlib" am: 0ccbc22083 am: 5055146d07...
Sonny Sasaka [Tue, 4 May 2021 20:45:39 +0000 (20:45 +0000)]
Merge "Add rust binaries to link with C++ staticlib" am: 0ccbc22083 am: 5055146d07 am: 97f17478ad

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

Change-Id: I1f55059bad2d2260ebe4fd33d5ab10e30b814c06

3 years agoMerge "Add TARGET_FLOSS define" am: 86cbc1a913 am: 6bd555c46c am: 6a5e6b3145
Sonny Sasaka [Tue, 4 May 2021 20:45:16 +0000 (20:45 +0000)]
Merge "Add TARGET_FLOSS define" am: 86cbc1a913 am: 6bd555c46c am: 6a5e6b3145

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

Change-Id: I2837afc48ad4b21990910ef7f4be09b69d38eaf4

3 years agoUse gatt_client_event_text convention for logging
Chris Manton [Fri, 30 Apr 2021 20:09:28 +0000 (13:09 -0700)]
Use gatt_client_event_text convention for logging

Bug: 183374320
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ib557fbeaefb4231ef911cbd3aa1f4f5b33000c69

3 years agoshim: Add l2cap per-channel network transfer metrics
Chris Manton [Fri, 30 Apr 2021 17:23:27 +0000 (10:23 -0700)]
shim: Add l2cap per-channel network transfer metrics

Bug: 183374320
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I25bb743c6f9052b93a1bb8c663033c22e2bd16a8

3 years agoMerge "OOB: Add public address to OOB data" am: 6107593afb am: 3d32a225dd
Martin Brabham [Tue, 4 May 2021 20:25:12 +0000 (20:25 +0000)]
Merge "OOB: Add public address to OOB data" am: 6107593afb am: 3d32a225dd

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

Change-Id: I31446a25a68580313cc74d864bd6715e5fc47b77

3 years agoMerge "Add rust binaries to link with C++ staticlib" am: 0ccbc22083 am: 5055146d07
Sonny Sasaka [Tue, 4 May 2021 20:25:01 +0000 (20:25 +0000)]
Merge "Add rust binaries to link with C++ staticlib" am: 0ccbc22083 am: 5055146d07

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

Change-Id: Ic6f3afcd575fd73d61d020a3694a77374a92a94c

3 years agoMerge "Add TARGET_FLOSS define" am: 86cbc1a913 am: 6bd555c46c
Sonny Sasaka [Tue, 4 May 2021 20:24:55 +0000 (20:24 +0000)]
Merge "Add TARGET_FLOSS define" am: 86cbc1a913 am: 6bd555c46c

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

Change-Id: Ibbfef5a3306a4e126d76dbf0bbf151c4ebec1ed4

3 years agoshim: Add hid profile to dumpsys
Chris Manton [Fri, 30 Apr 2021 00:27:38 +0000 (17:27 -0700)]
shim: Add hid profile to dumpsys

Bug: 183374320
Test: gd/cert/run
Tag: #refactor

Change-Id: I99f2584c52f1718f35b7b20abf713b0dfef1bd81

3 years agoAdd stack/gatt::gatt_channel_state_text
Chris Manton [Tue, 4 May 2021 01:16:55 +0000 (18:16 -0700)]
Add stack/gatt::gatt_channel_state_text

Bug: 163134718
Test: gd/cert/run
Tag: #refactor

Change-Id: I852e94277db93c1773b30d4ad91e1ac166270611

3 years agoAdd stack/gatt::gatt_security_action_text
Chris Manton [Mon, 3 May 2021 16:04:06 +0000 (09:04 -0700)]
Add stack/gatt::gatt_security_action_text

Bug: 163134718
Test: gd/cert/run
Tag: #refactor

Change-Id: Iecae9ca52a8660151de1ea4c4402f75a3790f43f

3 years agoMerge "OOB: Add public address to OOB data" am: 6107593afb
Martin Brabham [Tue, 4 May 2021 20:04:06 +0000 (20:04 +0000)]
Merge "OOB: Add public address to OOB data" am: 6107593afb

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

Change-Id: Ia69a0bc0243922084841fba93b28dd1a880bdacf

3 years agoMerge "Add rust binaries to link with C++ staticlib" am: 0ccbc22083
Sonny Sasaka [Tue, 4 May 2021 20:03:59 +0000 (20:03 +0000)]
Merge "Add rust binaries to link with C++ staticlib" am: 0ccbc22083

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

Change-Id: I2cb621a688d3c1ecf8af5f6e63afcb2298ae1cb6

3 years agoMerge "Add TARGET_FLOSS define" am: 86cbc1a913
Sonny Sasaka [Tue, 4 May 2021 20:02:33 +0000 (20:02 +0000)]
Merge "Add TARGET_FLOSS define" am: 86cbc1a913

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

Change-Id: I32e4fd29375810d67c0750bb4011819807e2f478

3 years agoMerge "OOB: Add public address to OOB data"
Martin Brabham [Tue, 4 May 2021 19:52:42 +0000 (19:52 +0000)]
Merge "OOB: Add public address to OOB data"

3 years agoAdd D-Bus daemon binary
Sonny Sasaka [Tue, 27 Apr 2021 08:36:14 +0000 (01:36 -0700)]
Add D-Bus daemon binary

The D-Bus daemon connects the RPC-agnostic API implementations in
`btstack` crate with the `dbus_projection` to make a D-Bus projection of
the API implementation.

Bug: 186492781
Tag: #floss
Test: manual - Use dbus-send util
Change-Id: I12391f4e9739a5d1ed6167990fc016429e7280d4

3 years agoAdd `dbus_projection` crate
Sonny Sasaka [Tue, 27 Apr 2021 08:04:11 +0000 (01:04 -0700)]
Add `dbus_projection` crate

The crate provides tools to project Rust API to D-Bus. The API needs to
follow go/floss-api-principles.

Bug: 186492781
Tag: #floss
Test: manual - tested with D-Bus integration in the next patch
Change-Id: I3bdf0ea0b935c45b4fb727fb79d0705eaf6f7b3e

3 years agoAdd the `btstack` crate
Sonny Sasaka [Tue, 27 Apr 2021 07:31:33 +0000 (00:31 -0700)]
Add the `btstack` crate

The `btstack` crate contains the floss API implementations independent
of any RPC projection. This patch adds the basic skeleton that
implements the first simplest methods.

Bug: 186492781
Tag: #floss
Test: manual - tested with D-Bus integration in the next patch
Change-Id: I10ff16d7e6cfcb599a3b356c58d7af15bcaa61d3

3 years agoMerge "Add rust binaries to link with C++ staticlib"
Sonny Sasaka [Tue, 4 May 2021 19:09:58 +0000 (19:09 +0000)]
Merge "Add rust binaries to link with C++ staticlib"

3 years agoMerge "Add TARGET_FLOSS define"
Sonny Sasaka [Tue, 4 May 2021 19:08:59 +0000 (19:08 +0000)]
Merge "Add TARGET_FLOSS define"

3 years agoEnum-ify stack/gatt::tGATT_SEC_ACTION am: 9948dd3af7 am: 2c4f0e59a0 am: 00f60a1b6d
Chris Manton [Tue, 4 May 2021 17:13:58 +0000 (17:13 +0000)]
Enum-ify stack/gatt::tGATT_SEC_ACTION am: 9948dd3af7 am: 2c4f0e59a0 am: 00f60a1b6d

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

Change-Id: Iac6b291ea1537c410fab72110597803b70360b77

3 years agoRemove unused field stack/avct/avct_int::ch_flags am: ca87a30723 am: 4fafb22111 am...
Chris Manton [Tue, 4 May 2021 17:13:56 +0000 (17:13 +0000)]
Remove unused field stack/avct/avct_int::ch_flags am: ca87a30723 am: 4fafb22111 am: 9371b9e889

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

Change-Id: I2837113ae431b800f5fab5196774b5973b4f6267

3 years agoRe-log stack/include::gatt_disconnection_reason_text am: 3016a29448 am: 6869774a8f...
Chris Manton [Tue, 4 May 2021 17:13:53 +0000 (17:13 +0000)]
Re-log stack/include::gatt_disconnection_reason_text am: 3016a29448 am: 6869774a8f am: 1f6a20f9d7

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

Change-Id: Ibb6ea213257a44dfd9ede797aef7b4979f034e44

3 years agoEnum-ify stack/gatt::tGATT_SEC_ACTION am: 9948dd3af7 am: 2c4f0e59a0
Chris Manton [Tue, 4 May 2021 16:56:45 +0000 (16:56 +0000)]
Enum-ify stack/gatt::tGATT_SEC_ACTION am: 9948dd3af7 am: 2c4f0e59a0

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

Change-Id: I58f04b801b8c7aab6282c0fcfdd51616a6f246e0

3 years agoRemove unused field stack/avct/avct_int::ch_flags am: ca87a30723 am: 4fafb22111
Chris Manton [Tue, 4 May 2021 16:56:44 +0000 (16:56 +0000)]
Remove unused field stack/avct/avct_int::ch_flags am: ca87a30723 am: 4fafb22111

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

Change-Id: Ie56934a6c14570483a80a857349078618ff05ca3

3 years agoRe-log stack/include::gatt_disconnection_reason_text am: 3016a29448 am: 6869774a8f
Chris Manton [Tue, 4 May 2021 16:56:42 +0000 (16:56 +0000)]
Re-log stack/include::gatt_disconnection_reason_text am: 3016a29448 am: 6869774a8f

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

Change-Id: Ib1814df1284f87aa8ae77a844e78b3485a0928f2

3 years agoEnum-ify stack/gatt::tGATT_SEC_ACTION am: 9948dd3af7
Chris Manton [Tue, 4 May 2021 16:42:55 +0000 (16:42 +0000)]
Enum-ify stack/gatt::tGATT_SEC_ACTION am: 9948dd3af7

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

Change-Id: Iab07e00714b787eb9cdb9d80181da18416f450e2

3 years agoRemove unused field stack/avct/avct_int::ch_flags am: ca87a30723
Chris Manton [Tue, 4 May 2021 16:42:53 +0000 (16:42 +0000)]
Remove unused field stack/avct/avct_int::ch_flags am: ca87a30723

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

Change-Id: I6b7d8ee3405cd16502c0539cf221c5599fe5cbc6

3 years agoRe-log stack/include::gatt_disconnection_reason_text am: 3016a29448
Chris Manton [Tue, 4 May 2021 16:42:08 +0000 (16:42 +0000)]
Re-log stack/include::gatt_disconnection_reason_text am: 3016a29448

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

Change-Id: Ifb6c4c286b221d2f84489c83266be6e62010cc35

3 years agoMerge changes I37e29f23,I512714db,If8acc10e am: f22c4c97da am: 1f99d539fe am: fe99197718
Chris Manton [Tue, 4 May 2021 15:28:43 +0000 (15:28 +0000)]
Merge changes I37e29f23,I512714db,If8acc10e am: f22c4c97da am: 1f99d539fe am: fe99197718

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

Change-Id: I0669ae36e99b829ab23624ba31f1ba752c009804

3 years agoMerge changes I37e29f23,I512714db,If8acc10e am: f22c4c97da am: 1f99d539fe
Chris Manton [Tue, 4 May 2021 15:02:38 +0000 (15:02 +0000)]
Merge changes I37e29f23,I512714db,If8acc10e am: f22c4c97da am: 1f99d539fe

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

Change-Id: I4bde439fd9c38590d1bbd61e2be5b1e925adc0bb

3 years agoMerge changes I37e29f23,I512714db,If8acc10e am: f22c4c97da
Chris Manton [Tue, 4 May 2021 14:47:44 +0000 (14:47 +0000)]
Merge changes I37e29f23,I512714db,If8acc10e am: f22c4c97da

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

Change-Id: Ie97ca6b2d76c50c03113b6f1ef9e639a4d523dc1

3 years agoEnum-ify stack/gatt::tGATT_SEC_ACTION
Chris Manton [Mon, 3 May 2021 06:13:02 +0000 (23:13 -0700)]
Enum-ify stack/gatt::tGATT_SEC_ACTION

Bug: 163134718
Test: gd/cert/run
Tag: #refactor

Change-Id: I57eb31e9e39f073380949dc9df4510a8adb81dfb

3 years agoRemove unused field stack/avct/avct_int::ch_flags
Chris Manton [Mon, 3 May 2021 16:04:32 +0000 (09:04 -0700)]
Remove unused field stack/avct/avct_int::ch_flags

Bug: 163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I9c969c5ce65094e6236166adcb281bc728602f79

3 years agoRe-log stack/include::gatt_disconnection_reason_text
Chris Manton [Mon, 3 May 2021 05:02:24 +0000 (22:02 -0700)]
Re-log stack/include::gatt_disconnection_reason_text

Bug: 163134718
Test: gd/cert/run
Tag: #refactor

Change-Id: I24b67cabd41737cddc431039289def92fd1f5e80

3 years agoMerge changes I37e29f23,I512714db,If8acc10e
Chris Manton [Tue, 4 May 2021 14:27:05 +0000 (14:27 +0000)]
Merge changes I37e29f23,I512714db,If8acc10e

* changes:
  dumpsys: Clarify dumpsys acceptlist sizing
  shim: Remove le from shadow accept list after connection
  Add include/hardware::bthh_connection_state_text

3 years agoParse scan_data_resp of advertisement tracking event correctly
Chienyuan [Tue, 4 May 2021 06:57:18 +0000 (14:57 +0800)]
Parse scan_data_resp of advertisement tracking event correctly

Bug: 187042424
Tag: #refactor
Test: sl4a, BleOnLostOnFoundTest
Change-Id: I6276ede692e18b2774d5268bf0a9ce2e0b09eabe

3 years agoMerge "btaa: fix static packed BtaaHciPacket struct" am: 670a667977 am: 31977c2a07...
Michael Sun [Tue, 4 May 2021 03:29:58 +0000 (03:29 +0000)]
Merge "btaa: fix static packed BtaaHciPacket struct" am: 670a667977 am: 31977c2a07 am: 36e134a3f0

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

Change-Id: I53e81d4d3307b317d413b429fe2476bf8fa6ceae

3 years agoMerge "Fix btaa activity attribution for Linux build" am: be4e9d5934 am: 0e0d8ac30e...
Abhishek Pandit-Subedi [Tue, 4 May 2021 03:29:23 +0000 (03:29 +0000)]
Merge "Fix btaa activity attribution for Linux build" am: be4e9d5934 am: 0e0d8ac30e am: 4e200deae6

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

Change-Id: Idd27c0d4bc4b00267f6e257fdb830b867df50a6d

3 years agoMerge "btaa: fix static packed BtaaHciPacket struct" am: 670a667977 am: 31977c2a07
Michael Sun [Tue, 4 May 2021 03:04:14 +0000 (03:04 +0000)]
Merge "btaa: fix static packed BtaaHciPacket struct" am: 670a667977 am: 31977c2a07

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

Change-Id: I0f298c846f0b7c123fc27c8a2b2fb4ca6303b5df

3 years agoMerge "Fix btaa activity attribution for Linux build" am: be4e9d5934 am: 0e0d8ac30e
Abhishek Pandit-Subedi [Tue, 4 May 2021 03:04:10 +0000 (03:04 +0000)]
Merge "Fix btaa activity attribution for Linux build" am: be4e9d5934 am: 0e0d8ac30e

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

Change-Id: Ibcf1853d94a3db8085ae05e24a33626fdf626742

3 years agoMerge "btaa: fix static packed BtaaHciPacket struct" am: 670a667977
Michael Sun [Tue, 4 May 2021 02:49:54 +0000 (02:49 +0000)]
Merge "btaa: fix static packed BtaaHciPacket struct" am: 670a667977

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

Change-Id: Iaa2309c5371be5122bbebbcd386626e2cdf30d78

3 years agoMerge "Fix btaa activity attribution for Linux build" am: be4e9d5934
Abhishek Pandit-Subedi [Tue, 4 May 2021 02:49:02 +0000 (02:49 +0000)]
Merge "Fix btaa activity attribution for Linux build" am: be4e9d5934

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

Change-Id: Iea64e3e6f5e5e0e2ccb7e9b41bc98a6c98158896

3 years agoMerge "btaa: fix static packed BtaaHciPacket struct"
Michael Sun [Tue, 4 May 2021 02:23:59 +0000 (02:23 +0000)]
Merge "btaa: fix static packed BtaaHciPacket struct"

3 years agoMerge "Fix btaa activity attribution for Linux build"
Abhishek Pandit-Subedi [Tue, 4 May 2021 01:56:08 +0000 (01:56 +0000)]
Merge "Fix btaa activity attribution for Linux build"

3 years agoMerge changes I35fefd23,Idaa677cb,If3a263d4 am: 78e895ba4d am: 5246f82b64 am: 552600acc5
Treehugger Robot [Tue, 4 May 2021 01:23:53 +0000 (01:23 +0000)]
Merge changes I35fefd23,Idaa677cb,If3a263d4 am: 78e895ba4d am: 5246f82b64 am: 552600acc5

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

Change-Id: I5a66b29482f0d829fc7e70edd9322d71a673139b

3 years agodumpsys: Clarify dumpsys acceptlist sizing
Chris Manton [Sun, 2 May 2021 21:08:11 +0000 (14:08 -0700)]
dumpsys: Clarify dumpsys acceptlist sizing

Bug: 183374320
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I37e29f239f48f3547a20f156886bd20c72253b7d

3 years agoshim: Remove le from shadow accept list after connection
Chris Manton [Sun, 2 May 2021 20:10:51 +0000 (13:10 -0700)]
shim: Remove le from shadow accept list after connection

Bug: 183374320
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I512714dbca70afd8fb169de6a6f161974a46c802

3 years agoAdd include/hardware::bthh_connection_state_text
Chris Manton [Thu, 29 Apr 2021 20:43:55 +0000 (13:43 -0700)]
Add include/hardware::bthh_connection_state_text

Bug: 163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: If8acc10eec65cb507ff292c81017e89cd6ccfb82

3 years agoMerge changes I35fefd23,Idaa677cb,If3a263d4 am: 78e895ba4d am: 5246f82b64
Treehugger Robot [Tue, 4 May 2021 01:01:32 +0000 (01:01 +0000)]
Merge changes I35fefd23,Idaa677cb,If3a263d4 am: 78e895ba4d am: 5246f82b64

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

Change-Id: Icdac8bb9b364d344d869d59a425e3468de37bdad

3 years agoMerge changes I35fefd23,Idaa677cb,If3a263d4 am: 78e895ba4d
Treehugger Robot [Tue, 4 May 2021 00:34:05 +0000 (00:34 +0000)]
Merge changes I35fefd23,Idaa677cb,If3a263d4 am: 78e895ba4d

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

Change-Id: Ie1d31cce815ef0a316e4b79afd0c49b69bbf0bf3

3 years agoMerge changes I35fefd23,Idaa677cb,If3a263d4
Treehugger Robot [Tue, 4 May 2021 00:15:42 +0000 (00:15 +0000)]
Merge changes I35fefd23,Idaa677cb,If3a263d4

* changes:
  Introduce stack_btu_test
  Remove bta/hh/bta_hh_le::BTA_HH_DEBUG
  Remove execute bit for source file bta/hh/bta_hh_le

3 years agobtaa: fix static packed BtaaHciPacket struct
Michael Sun [Mon, 3 May 2021 16:34:29 +0000 (16:34 +0000)]
btaa: fix static packed BtaaHciPacket struct

Update the BtaaHciPacket to not use packet pragma as it is platform
dependent. Further updated the HciProcessor to eliminate static
declarations.

Tag: #feature
Bug: 187019165
Test: mmma -j system/bt
BYPASS_LONG_LINES_REASON: consist with gd format

Change-Id: I82bf7fcfa50c9911a8b7cdc69e0da68eb2b80a35

3 years agoAdd topshim for bluetooth interface
Abhishek Pandit-Subedi [Sat, 10 Apr 2021 01:00:41 +0000 (18:00 -0700)]
Add topshim for bluetooth interface

In order for the Rust front-end to use the bluetooth interface, add
a topshim to give Rust code access to C++.

Also includes some debug code in adapter/main.rs which will eventually
be replaced with a proper dbus frontend.

Bug: 183208689
Tag: #floss
Test: atest --host bluetooth_test_gd
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 char lines

Change-Id: I58caec1ffadcc1d8d7e92f7c9669fa4f4d5bb91f

3 years agoFix btaa activity attribution for Linux build
Abhishek Pandit-Subedi [Mon, 3 May 2021 22:56:03 +0000 (22:56 +0000)]
Fix btaa activity attribution for Linux build

Missing entries in BUILD.gn and Linux stubs for dumpsys.

Bug: 187109138
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: I9d72a29d56d0461375cc9235894a384dae183fd6

3 years agoMerge "Replace base::MessageLoopCurrent* by base::Current*Thread" am: 4a5ae7d60e...
Treehugger Robot [Mon, 3 May 2021 22:32:13 +0000 (22:32 +0000)]
Merge "Replace base::MessageLoopCurrent* by base::Current*Thread" am: 4a5ae7d60e am: 22e232691b am: 91293f7c5a

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

Change-Id: I8c509b2dde488cf3b9159cd407b64840069841a2

3 years agoAdd rust binaries to link with C++ staticlib
Abhishek Pandit-Subedi [Mon, 15 Mar 2021 20:54:19 +0000 (13:54 -0700)]
Add rust binaries to link with C++ staticlib

Rather than using C++ binaries to link with Rust staticlib, we do it the
other way around. This allows us to write our dbus frontend with Rust
instead.

Bug: 179821440
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: I63037e0aaea152a4855e0a49971c1b2f9c312ac5

3 years agoAdd TARGET_FLOSS define
Abhishek Pandit-Subedi [Mon, 26 Apr 2021 19:40:11 +0000 (12:40 -0700)]
Add TARGET_FLOSS define

OS_GENERIC is used for host tests and Linux builds but it unfortunately
puts everything at the current working directory. Add a TARGET_FLOSS
define so that we can put them at absolute locations (i.e.
/etc/bluetooth).

Bug: 186442862
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: I1c9aaacd1b36b80523437b050d2232b7e5bba47c

3 years agoOOB: Add public address to OOB data
Martin Brabham [Tue, 27 Apr 2021 04:35:22 +0000 (21:35 -0700)]
OOB: Add public address to OOB data

Will need to figure out private addresses in follow-up CL

Bug: 178007935
Test: Compiles, test app.
Tag: #feature
Change-Id: I73e3ef9fbefb5443dbe719471683af3e3bcb4e1b

3 years agoMerge "Replace base::MessageLoopCurrent* by base::Current*Thread" am: 4a5ae7d60e...
Treehugger Robot [Mon, 3 May 2021 22:15:02 +0000 (22:15 +0000)]
Merge "Replace base::MessageLoopCurrent* by base::Current*Thread" am: 4a5ae7d60e am: 22e232691b

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

Change-Id: Ifb328d556c67fd1d6dee1cfc49c8259efd303e8d

3 years agoMerge "Replace base::MessageLoopCurrent* by base::Current*Thread" am: 4a5ae7d60e
Treehugger Robot [Mon, 3 May 2021 21:51:08 +0000 (21:51 +0000)]
Merge "Replace base::MessageLoopCurrent* by base::Current*Thread" am: 4a5ae7d60e

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

Change-Id: I79b0f05a4e89df9e098f0fdc0348ba69293edd17

3 years agoMerge "Replace base::MessageLoopCurrent* by base::Current*Thread"
Treehugger Robot [Mon, 3 May 2021 21:35:53 +0000 (21:35 +0000)]
Merge "Replace base::MessageLoopCurrent* by base::Current*Thread"

3 years agoMerge "Handle connection failures on the control channel properly" am: 8c65349370...
Sal Savage [Mon, 3 May 2021 21:30:02 +0000 (21:30 +0000)]
Merge "Handle connection failures on the control channel properly" am: 8c65349370 am: a5cb92e7c9 am: ecb5a31654

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

Change-Id: Iafd10a5c8306ce3413196aba0ac62b641b73235a

3 years agoMerge "Add script to generate libchrome R91 version" am: 37d2b47789 am: 30aec5a0e1...
Sonny Sasaka [Mon, 3 May 2021 21:29:55 +0000 (21:29 +0000)]
Merge "Add script to generate libchrome R91 version" am: 37d2b47789 am: 30aec5a0e1 am: 016713f115

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

Change-Id: I5b74978a2bc300fc5227435a82574761e7663e15

3 years agoMerge "Handle connection failures on the control channel properly" am: 8c65349370...
Sal Savage [Mon, 3 May 2021 21:13:18 +0000 (21:13 +0000)]
Merge "Handle connection failures on the control channel properly" am: 8c65349370 am: a5cb92e7c9

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

Change-Id: I67f77802d007b6038b6245615b7a347456324b41

3 years agoMerge "Add script to generate libchrome R91 version" am: 37d2b47789 am: 30aec5a0e1
Sonny Sasaka [Mon, 3 May 2021 21:13:12 +0000 (21:13 +0000)]
Merge "Add script to generate libchrome R91 version" am: 37d2b47789 am: 30aec5a0e1

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

Change-Id: I7c5302257eb40a0fdd73434a7f4e121a16532203

3 years agoMerge "Handle connection failures on the control channel properly" am: 8c65349370
Sal Savage [Mon, 3 May 2021 20:49:32 +0000 (20:49 +0000)]
Merge "Handle connection failures on the control channel properly" am: 8c65349370

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

Change-Id: I240d1837118c778edbe825c019cedd7ae30bcdb6

3 years agoMerge "Add script to generate libchrome R91 version" am: 37d2b47789
Sonny Sasaka [Mon, 3 May 2021 20:48:33 +0000 (20:48 +0000)]
Merge "Add script to generate libchrome R91 version" am: 37d2b47789

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

Change-Id: Ib53269f3bd52162fff817c4cdaf210f6d7d814da

3 years agoMerge "Handle connection failures on the control channel properly"
Sal Savage [Mon, 3 May 2021 20:40:03 +0000 (20:40 +0000)]
Merge "Handle connection failures on the control channel properly"

3 years agoMerge "Add script to generate libchrome R91 version"
Sonny Sasaka [Mon, 3 May 2021 20:11:38 +0000 (20:11 +0000)]
Merge "Add script to generate libchrome R91 version"

3 years agoReplace base::MessageLoopCurrent* by base::Current*Thread
Abhishek Pandit-Subedi [Mon, 3 May 2021 19:56:20 +0000 (12:56 -0700)]
Replace base::MessageLoopCurrent* by base::Current*Thread

Make changes necessary for recent uprev of libchrome to r822064.

Bug: 187086497
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: I63f954c1ce5e0bf455e1da1e258d4a8b88fcfc9d

3 years agoMerge "OOB: Generate random for LE" am: 2d2e4a7603 am: a90ff5062b am: f91d13d6d6
Treehugger Robot [Mon, 3 May 2021 18:34:44 +0000 (18:34 +0000)]
Merge "OOB: Generate random for LE" am: 2d2e4a7603 am: a90ff5062b am: f91d13d6d6

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

Change-Id: I2d809d6914cd7b4ce6c01439d4da315bcd48e35a

3 years agoMerge "OOB: Generate random for LE" am: 2d2e4a7603 am: a90ff5062b
Treehugger Robot [Mon, 3 May 2021 18:17:54 +0000 (18:17 +0000)]
Merge "OOB: Generate random for LE" am: 2d2e4a7603 am: a90ff5062b

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

Change-Id: I73338a3dee1f56210fca516841dab27680dd8400

3 years agoMerge "OOB: Generate random for LE" am: 2d2e4a7603
Treehugger Robot [Mon, 3 May 2021 18:02:18 +0000 (18:02 +0000)]
Merge "OOB: Generate random for LE" am: 2d2e4a7603

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

Change-Id: Iac71010f1b4c621240cbb262a00e01606d65b618

3 years agoMerge "OOB: Generate random for LE"
Treehugger Robot [Mon, 3 May 2021 17:40:25 +0000 (17:40 +0000)]
Merge "OOB: Generate random for LE"

3 years agoUnnecessary def BTA_GATTC_CONN_MAX => GATT_MAX_PHY_CHANNEL am: f50690c3fc am: 147e086...
Chris Manton [Mon, 3 May 2021 04:35:21 +0000 (04:35 +0000)]
Unnecessary def BTA_GATTC_CONN_MAX => GATT_MAX_PHY_CHANNEL am: f50690c3fc am: 147e0865f6 am: c91c057057

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

Change-Id: I01a13a8ef60f51509f36aa385629ac193a4f9502

3 years agoRe-point bta:: tests to common test/mock am: 2dbbbca5f1 am: 793a6f4e2e am: 02e73f418e
Chris Manton [Mon, 3 May 2021 04:35:19 +0000 (04:35 +0000)]
Re-point bta:: tests to common test/mock am: 2dbbbca5f1 am: 793a6f4e2e am: 02e73f418e

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

Change-Id: I31dd9447d6b2b87216d1b9c23a3684d13c19ae34

3 years agoConst-ify the bta/hh/bta_hh::API data types am: ee6b8adcd1 am: df48c8caf4 am: 1b6a5b8bc6
Chris Manton [Mon, 3 May 2021 04:35:18 +0000 (04:35 +0000)]
Const-ify the bta/hh/bta_hh::API data types am: ee6b8adcd1 am: df48c8caf4 am: 1b6a5b8bc6

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

Change-Id: I2d7681d7b0495fad4982e8d62b9206664263cbd8

3 years agoRemove unused member tHID_HOST_DEV_CTB::conn_substate am: a67b1f54c9 am: cf27c01f85...
Chris Manton [Mon, 3 May 2021 04:35:16 +0000 (04:35 +0000)]
Remove unused member tHID_HOST_DEV_CTB::conn_substate am: a67b1f54c9 am: cf27c01f85 am: 4aea75a9e9

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

Change-Id: I336b6a5cc70956b9a150524abab065493696eee6

3 years agoMove stack/l2cap::text from compilation unit into header am: 3fbc096f45 am: d71103226...
Chris Manton [Mon, 3 May 2021 04:35:15 +0000 (04:35 +0000)]
Move stack/l2cap::text from compilation unit into header am: 3fbc096f45 am: d711032263 am: c1622e0415

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

Change-Id: I1344021dc4db15baf681f6a1c9831f745eab7961

3 years agoAdd BTA_ID_HH for logging am: 568b92ff38 am: 6e6cdb942b am: db25173a7d
Chris Manton [Mon, 3 May 2021 04:35:13 +0000 (04:35 +0000)]
Add BTA_ID_HH for logging am: 568b92ff38 am: 6e6cdb942b am: db25173a7d

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

Change-Id: I1b7e209d0064fecc4c86e749de6caf7b63dafdcb

3 years agoAdd include/hardware/bt_hh::bthh_connection_state_text am: df8fbbf2b6 am: e7d8d3d11d...
Chris Manton [Mon, 3 May 2021 04:35:12 +0000 (04:35 +0000)]
Add include/hardware/bt_hh::bthh_connection_state_text am: df8fbbf2b6 am: e7d8d3d11d am: 3249ff0aae

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

Change-Id: Ib170f09a477d91120a1ed9e0b687039fcd5b8a15

3 years agoRemove unused declaration am: f260dc6e96 am: ed8f21eb6e am: a5bc267a79
Chris Manton [Mon, 3 May 2021 04:35:10 +0000 (04:35 +0000)]
Remove unused declaration am: f260dc6e96 am: ed8f21eb6e am: a5bc267a79

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

Change-Id: I97f257af63a651c7d7f9dc38c12f6ab9bbb5578d

3 years agobtm_log: Streamline hid logging am: f7dd3dd0bf am: 19c19a4670 am: 161efa66c5
Chris Manton [Mon, 3 May 2021 04:35:08 +0000 (04:35 +0000)]
btm_log: Streamline hid logging am: f7dd3dd0bf am: 19c19a4670 am: 161efa66c5

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

Change-Id: Ic359e50db2c20eab702f966c426e74d8661b3b83

3 years agolog: Swap proper initiator am: 0973f8d157 am: 8561ca0747 am: 8f337f5984
Chris Manton [Mon, 3 May 2021 04:35:05 +0000 (04:35 +0000)]
log: Swap proper initiator am: 0973f8d157 am: 8561ca0747 am: 8f337f5984

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

Change-Id: I5c2bb0f42ee731f3e8ec395561c2678a1cbf523f

3 years agoUnnecessary def BTA_GATTC_CONN_MAX => GATT_MAX_PHY_CHANNEL am: f50690c3fc am: 147e0865f6
Chris Manton [Mon, 3 May 2021 04:12:54 +0000 (04:12 +0000)]
Unnecessary def BTA_GATTC_CONN_MAX => GATT_MAX_PHY_CHANNEL am: f50690c3fc am: 147e0865f6

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

Change-Id: I452e6c173da4c2c205f706a238100280f2099409

3 years agoRe-point bta:: tests to common test/mock am: 2dbbbca5f1 am: 793a6f4e2e
Chris Manton [Mon, 3 May 2021 04:12:53 +0000 (04:12 +0000)]
Re-point bta:: tests to common test/mock am: 2dbbbca5f1 am: 793a6f4e2e

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

Change-Id: Ifc47023c0d2b40688722c83ab4b7fef9e8897b32