OSDN Git Service
Chris Manton [Mon, 3 May 2021 03:58:55 +0000 (03:58 +0000)]
Add include/hardware/bt_hh::bthh_connection_state_text am:
df8fbbf2b6
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692792
Change-Id: Icd5f41ee2e0b42dc7ca60d47a03bf698fc48988f
Chris Manton [Mon, 3 May 2021 03:58:52 +0000 (03:58 +0000)]
Remove unused declaration am:
f260dc6e96
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692791
Change-Id: I2b8eacbd64e9ac64dfeb812ddd2efe92696a31e2
Chris Manton [Mon, 3 May 2021 03:58:50 +0000 (03:58 +0000)]
btm_log: Streamline hid logging am:
f7dd3dd0bf
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692790
Change-Id: If4e8e7ba18e6a67779b5f80d877ac9420792a967
Chris Manton [Mon, 3 May 2021 03:58:03 +0000 (03:58 +0000)]
log: Swap proper initiator am:
0973f8d157
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692789
Change-Id: Icb78817b012519b7151a8374b1d66da6f5b4df75
Chris Manton [Thu, 29 Apr 2021 20:43:55 +0000 (13:43 -0700)]
Add include/hardware/bt_hh::bthh_connection_state_text
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I9050d99e913c96454837f95a266efcf828bcf6b4
Chris Manton [Thu, 29 Apr 2021 05:23:22 +0000 (22:23 -0700)]
Remove unused declaration
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I5c6a76d903e56fe4ec721ec0701e305e8bd1b13d
Chris Manton [Thu, 29 Apr 2021 05:22:49 +0000 (22:22 -0700)]
btm_log: Streamline hid logging
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
No-Typo-Check: Legacy code mocks
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: If3f967ddabe64c481536debd44a31b989eff1565
Chris Manton [Thu, 29 Apr 2021 00:51:59 +0000 (17:51 -0700)]
log: Swap proper initiator
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I9ade378b5de1677d6be9d7e56af8589ff023e613
Treehugger Robot [Sat, 1 May 2021 20:35:02 +0000 (20:35 +0000)]
Merge "ScanningManagerTest: Wait for the Filter command" am:
81ce4d3e70
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692906
Change-Id: Id0347af4b3465bce562c48549f0aca31608211c4
Myles Watson [Sat, 1 May 2021 20:34:55 +0000 (20:34 +0000)]
GD: Split tests into module vs unit tests am:
479f99dcab
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692905
Change-Id: I2e600abbaaec0e6acd7d82d2abea062d6b804962
Treehugger Robot [Sat, 1 May 2021 20:21:47 +0000 (20:21 +0000)]
Merge "ScanningManagerTest: Wait for the Filter command"
Myles Watson [Fri, 30 Apr 2021 23:45:51 +0000 (16:45 -0700)]
ScanningManagerTest: Wait for the Filter command
Bug:
176832968
Test: atest bluetooth_test_gd
Tag: #gd-refactor
Change-Id: Idf36458a196e1ad3278f3eb8a2d384586ac40afe
Myles Watson [Sat, 1 May 2021 14:15:40 +0000 (07:15 -0700)]
GD: Split tests into module vs unit tests
Move simpler, single-threaded tests into their own set of unit tests.
Bug:
176832968
Test: atest bluetooth_test_gd_unit
Tag: #gd-refactor
Change-Id: Ic3fa06454d119764aa547f975843583c00c32fc4
Erwin Jansen [Sat, 1 May 2021 00:45:12 +0000 (00:45 +0000)]
Enable missing HCI cmds in rootcanal am:
1d73e8ba2d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1692659
Change-Id: I306349ec2b6d0f627bd5f0ed951ecc62b0fa54b6
Erwin Jansen [Fri, 30 Apr 2021 22:31:21 +0000 (15:31 -0700)]
Enable missing HCI cmds in rootcanal
This enables:
- 7.8.44 LE Set Address Resolution Enable command
- 7.8.45 LE Set Resolvable Private Address Timeout
Both are NOPs for now.
Bug:
186861350
Bug:
186541528
Test: NimBLE gets a bit further with root canal
Change-Id: I3d1b95a30afc97d1f1f7555ac891b4f4df872eec
Treehugger Robot [Fri, 30 Apr 2021 22:32:15 +0000 (22:32 +0000)]
Merge "ACL: Delay early RoleChange until after a ConnectionComplete" am:
caa93c7426
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1688961
Change-Id: I8df0ab31dd66155f96c75f43516e72867e8da3e8
Treehugger Robot [Fri, 30 Apr 2021 22:12:41 +0000 (22:12 +0000)]
Merge "ACL: Delay early RoleChange until after a ConnectionComplete"
Erwin Jansen [Fri, 30 Apr 2021 21:51:03 +0000 (21:51 +0000)]
Merge "Compilation fixes for MSVC" am:
4e04984bb3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1688811
Change-Id: I16d3dfc14d73d7615d0b432b9b1ffe9ec80db885
Erwin Jansen [Fri, 30 Apr 2021 21:35:37 +0000 (21:35 +0000)]
Merge "Compilation fixes for MSVC"
Treehugger Robot [Fri, 30 Apr 2021 21:27:51 +0000 (21:27 +0000)]
Merge changes I02cc2057,Icb879814,I468ac585,Idf93afcf,If3006967, ... am:
f54f80ed1e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1680525
Change-Id: I5152f26613970ca1c173fbdca266d703a18ba4e1
Treehugger Robot [Fri, 30 Apr 2021 21:00:13 +0000 (21:00 +0000)]
Merge changes I02cc2057,Icb879814,I468ac585,Idf93afcf,If3006967, ...
* changes:
btaa: Add device-activity aggregation dumpsys data
btaa: HCI ACL/SCO/ISO data packets process
btaa: gd: Add wakeup reason dumpsys data
btaa: attribute wakeup and wakelock duration over processed HCI buckets
btaa: HCI LE and special event process
btaa: HCI classic event process
btaa: HCI command process
btaa: handle wakelock notification
btaa: handle wakeup notification
Myles Watson [Wed, 28 Apr 2021 00:52:21 +0000 (17:52 -0700)]
ACL: Delay early RoleChange until after a ConnectionComplete
Bug:
180137651
Tag: #gd-refactor
Test: cert/run
BYPASS_LONG_LINES_REASON: Bluetooth
Change-Id: I02879eff0dfa9589a240042cb53bf57412214fad
Myles Watson [Fri, 30 Apr 2021 15:42:56 +0000 (15:42 +0000)]
Merge "gd: Implement batch scan" am:
cbe859c150
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1688307
Change-Id: I73a3df20bc21a168586b4d8c43606e07ead49fa7
Myles Watson [Fri, 30 Apr 2021 15:25:39 +0000 (15:25 +0000)]
Merge "gd: Implement batch scan"
Martin Brabham [Fri, 30 Apr 2021 00:35:26 +0000 (00:35 +0000)]
Disable SecurityRecordStorageTests am:
8bac0c8d52
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690695
Change-Id: I4474cc2781fe4abb15f898ec835aa5b9eb085003
Martin Brabham [Thu, 29 Apr 2021 22:43:02 +0000 (15:43 -0700)]
Disable SecurityRecordStorageTests
Bug:
176170066
Test: atest --host bluetooth_test_gd:SecurityRecordStorageTest (Fails to run/doesn't
exist)
Tag: #refactor
Change-Id: I4aac224fcdd7ee31ce6e672dc4d5b9653b605b7e
Martin Brabham [Thu, 29 Apr 2021 20:53:59 +0000 (20:53 +0000)]
Merge "OOB: generateLocalOobdata()" am:
89d078cf99
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1677348
Change-Id: I9088aca4d645d360dcdd51d32323f19e6b3766b3
Treehugger Robot [Thu, 29 Apr 2021 20:50:54 +0000 (20:50 +0000)]
Merge "gd: Find and fill TX Power with the correct value" am:
d348c92a3a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1689575
Change-Id: Ifd897bad2bc0f3042f5077fdd03fbc5c9d9e477b
Grzegorz Kołodziejczyk [Thu, 29 Apr 2021 20:50:43 +0000 (20:50 +0000)]
Don't try to do read multiple procedure if only one attribute is to read am:
f0f323c98c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690792
Change-Id: I564e48e1183887da32bc053b919002225dcf283b
Martin Brabham [Thu, 29 Apr 2021 18:51:28 +0000 (18:51 +0000)]
Merge "OOB: generateLocalOobdata()"
Treehugger Robot [Thu, 29 Apr 2021 18:33:26 +0000 (18:33 +0000)]
Merge "gd: Find and fill TX Power with the correct value"
Grzegorz Kołodziejczyk [Thu, 29 Apr 2021 16:36:07 +0000 (16:36 +0000)]
Don't try to do read multiple procedure if only one attribute is to read
Read multiple command requires at least two handles to be performed.
Test: Discovery GATT db with single descriptor characteristic
Sponsor: jpawlowski@
Change-Id: I36bb1077ab8fe6adb3c94274b8ffde56086fd611
Chienyuan [Tue, 27 Apr 2021 17:34:27 +0000 (01:34 +0800)]
gd: Implement batch scan
Tag: #gd-refactor
Bug:
186234480
Test: gd/cert/run
Test: bluetooth_test_gd
Test: sl4a, BleOpportunisticScanTest:test_batch_scan_result
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I5060826ff79030cae0bacb44e67acc6f42c6adb4
Chienyuan [Thu, 29 Apr 2021 07:54:49 +0000 (15:54 +0800)]
gd: Find and fill TX Power with the correct value
Tag: #gd-refactor
Bug:
185962046
Test: gd/cert/run
Test: manual
Change-Id: If49961fc02d0cdebc28f0d8d247a98ed35bcd6b4
Sonny Sasaka [Thu, 29 Apr 2021 05:43:12 +0000 (05:43 +0000)]
Merge "Change build.py ordering for rust and main" am:
6a2c03267e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1668070
Change-Id: I6ab60d8afed2f5fc2c45b9b9c7b150aee1558ddb
Sonny Sasaka [Thu, 29 Apr 2021 05:42:28 +0000 (05:42 +0000)]
Merge "Fixes for Linux build" am:
22a183c1f9
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687437
Change-Id: I84f7c32bce87dc49aed0f2b65200c2c667192d22
Sonny Sasaka [Thu, 29 Apr 2021 05:24:19 +0000 (05:24 +0000)]
Merge "Change build.py ordering for rust and main"
Sonny Sasaka [Thu, 29 Apr 2021 05:23:48 +0000 (05:23 +0000)]
Merge "Fixes for Linux build"
Chris Manton [Thu, 29 Apr 2021 03:21:40 +0000 (03:21 +0000)]
Fix for hid disconnect with unknown channel am:
d6c80b565b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690102
Change-Id: I8bf3f3d3dfb6d05e9b1d428b277cd07c96f0b1ba
Chris Manton [Thu, 29 Apr 2021 03:21:38 +0000 (03:21 +0000)]
Konstify configurable params kHID_HOST_MAX_DEVICES am:
828bb060ba
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690101
Change-Id: I2e15fa50d213fcabac36fc5759dd4b372f2dc8d6
Chris Manton [Thu, 29 Apr 2021 03:21:35 +0000 (03:21 +0000)]
Add test legacy trace stub am:
0d6ef5aee5
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690100
Change-Id: I4f28f3706c0d184368bb5d5b128e205a95e66895
Chris Manton [Thu, 29 Apr 2021 03:21:32 +0000 (03:21 +0000)]
Re-include stack/hid/hidh_int am:
81a6d36b91
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690099
Change-Id: I0c8a4bb73d130c603a8b7a95424acb33c8536059
Chris Manton [Thu, 29 Apr 2021 03:21:29 +0000 (03:21 +0000)]
Re-include stack/hid/hidd_int am:
6c023bee12
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690098
Change-Id: I8efc1ed2e113e36bff0855ff218df82b551d4f3e
Chris Manton [Thu, 29 Apr 2021 03:21:26 +0000 (03:21 +0000)]
Decl-def same line stack var stack/hid/::tHID_CONN am:
e909785521
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690097
Change-Id: If536494a67b677cd2d7d19394d7242a6d1cedfdf
Chris Manton [Thu, 29 Apr 2021 03:20:46 +0000 (03:20 +0000)]
Re-log stack/btm/btm_sec::btm_sec_l2cap_access_req_by_requirement am:
aa908a4341
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1676596
Change-Id: I0eaf8e1e7127f0769f05d048ae5494ed3c8e34ab
Chris Manton [Wed, 28 Apr 2021 19:15:51 +0000 (12:15 -0700)]
Fix for hid disconnect with unknown channel
Also introduce net_test_stack_hid
And update mocks to allow functional replacement
Bug:
181199209
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: Iab4ac55477d2d98d52d7b77aee19b4172c63e4eb
Chris Manton [Wed, 28 Apr 2021 19:15:26 +0000 (12:15 -0700)]
Konstify configurable params kHID_HOST_MAX_DEVICES
Bug:
181199209
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I8b73da2ddebce5117e8bb91176c5cebfef093315
Chris Manton [Wed, 28 Apr 2021 19:14:48 +0000 (12:14 -0700)]
Add test legacy trace stub
Bug:
181199209
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: Ie5be989255c5609da81b6126c266f18f45007e83
Chris Manton [Wed, 28 Apr 2021 16:08:44 +0000 (09:08 -0700)]
Re-include stack/hid/hidh_int
Bug:
181199209
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I834a2e1cf0ba81cb7cc118dfdae3a0e583c4fc8e
Chris Manton [Wed, 28 Apr 2021 16:07:01 +0000 (09:07 -0700)]
Re-include stack/hid/hidd_int
Bug:
181199209
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I99339cd65df45efc918694a115bce3fffdb86efc
Chris Manton [Wed, 28 Apr 2021 15:49:14 +0000 (08:49 -0700)]
Decl-def same line stack var stack/hid/::tHID_CONN
Bug:
181199209
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: Ia8f9aa24b72a1bd3b57c3bd850a022a81c2e174b
Chris Manton [Sat, 17 Apr 2021 00:16:47 +0000 (17:16 -0700)]
Re-log stack/btm/btm_sec::btm_sec_l2cap_access_req_by_requirement
Toward loggable code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I7566e6b37b3471fd7fd12e957d30d4585b86f26e
Chen Chen [Wed, 28 Apr 2021 19:45:26 +0000 (19:45 +0000)]
Merge "BluetoothMetrics: Remove MetricIdAllocator reference from HalCrashReason" am:
fff897e016
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1688816
Change-Id: Ia02fb27426e830f12cd474b085ac0f9567a9d1a4
Chris Manton [Wed, 28 Apr 2021 19:35:59 +0000 (19:35 +0000)]
shim: Check if dumpsys module has started before invoking am:
932e7f65c3
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1682670
Change-Id: Ief9eb33fb4605947a1581b1de4e64aadf541461d
Chen Chen [Wed, 28 Apr 2021 17:07:47 +0000 (17:07 +0000)]
Merge "BluetoothMetrics: Remove MetricIdAllocator reference from HalCrashReason"
Martin Brabham [Wed, 14 Apr 2021 20:10:45 +0000 (13:10 -0700)]
OOB: generateLocalOobdata()
Implement generation of LE OOB Data
- Remove GD flag to NOP for OobDataReply.
GD Stack is only up to ACL, so Legacy SM needs to properly function.
Bug:
184377951
Tag: #feature
Test: Manual implementation from p/a/Settings
Change-Id: I6072c70f5e6707eb8f3a6126ffa1edbb5cba5aa4
Chris Manton [Wed, 28 Apr 2021 04:27:06 +0000 (04:27 +0000)]
Merge "shim: Add entry to query gd dumpsys module" am:
0bab3cd415
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1682669
Change-Id: I92eda25ada2f38b396d29b3445f9dfafa6d2dcb3
Chris Manton [Tue, 20 Apr 2021 22:16:56 +0000 (15:16 -0700)]
shim: Check if dumpsys module has started before invoking
Bug:
182544206
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I67c83b36a7a9e5ac476d47760562d78bc1c95d36
Chris Manton [Wed, 28 Apr 2021 04:14:36 +0000 (04:14 +0000)]
Merge "shim: Add entry to query gd dumpsys module"
Weichin Weng [Wed, 28 Apr 2021 02:38:56 +0000 (02:38 +0000)]
Merge "GD: Add LogBluetoothHalCrashReason" am:
d51c922278
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687625
Change-Id: Id53dd4aeeb0a7b8e4b7636597406fe4f07747690
Weichin Weng [Wed, 28 Apr 2021 02:17:35 +0000 (02:17 +0000)]
Merge "GD: Add LogBluetoothHalCrashReason"
Chen Chen [Tue, 27 Apr 2021 23:14:57 +0000 (16:14 -0700)]
BluetoothMetrics: Remove MetricIdAllocator reference from HalCrashReason
Calling MetricIdAllocator may break its singleton pattern when stack is
half gd and half legacy. Since we are not inputing metric id at this
point, the easiest way is to just delete the reference.
Bug:
181819141
Test: atest --host bluetooth_test_common
Tag: #stability
Change-Id: If4bf0a87a55ef4ee5460065c43577ed22d7b28eb
Myles Watson [Wed, 28 Apr 2021 01:02:34 +0000 (01:02 +0000)]
Merge "HCI: Add SetEventMaskPage2 Opcode" am:
b68e9e5c78
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687245
Change-Id: I73613e5fc44a5de0b5fd0ba9bf0c6e3c8e08529c
Myles Watson [Wed, 28 Apr 2021 00:50:41 +0000 (00:50 +0000)]
Merge "HCI: Add SetEventMaskPage2 Opcode"
weichinweng [Tue, 27 Apr 2021 02:14:25 +0000 (10:14 +0800)]
GD: Add LogBluetoothHalCrashReason
Add LogBluetoothHalCrashReason function in GD to collect Bluetooth hal
crash reason.
Bug:
174284338
Tag: #feature
Test: atest BluetoothInstrumentationTests
Change-Id: Ibdf4e1acd60f2f13f65c61c69421192ff246850b
Chris Manton [Tue, 27 Apr 2021 21:39:02 +0000 (21:39 +0000)]
Merge "shim: Add method to query stack manager for gd dumpsys module start" am:
070516726e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1682668
Change-Id: I9b2aa0044911ea92546ad2f28b82a33eed9c8d1a
Erwin Jansen [Tue, 27 Apr 2021 21:30:32 +0000 (14:30 -0700)]
Compilation fixes for MSVC
This makes a few changes to compile the libary under clang-cl targeting
windows 10.
- We cannot cast a path to std::string in msvc
- Incorrect function names for generated code, causing linker failures
under windows.
Bug:
186568522
Test: Can successfully build packet gen as part of android emulator
Change-Id: I0edebc3bf459669998295dfbee08df30d4381ff8
Chris Manton [Tue, 20 Apr 2021 21:04:17 +0000 (14:04 -0700)]
shim: Add entry to query gd dumpsys module
Bug:
182544206
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I7d31565442129ece0778a377a34961a18e2e3e0a
Chris Manton [Tue, 27 Apr 2021 21:09:52 +0000 (21:09 +0000)]
Merge "shim: Add method to query stack manager for gd dumpsys module start"
Chris Manton [Tue, 27 Apr 2021 20:53:18 +0000 (20:53 +0000)]
Re-point main/test/ to use common test/mock am:
3a92009d3b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687431
Change-Id: I17e2a478a24d64950104a65b0086dab90d021db3
Chris Manton [Tue, 27 Apr 2021 20:53:16 +0000 (20:53 +0000)]
Re-include bta/vc/devices am:
633d92d79e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1688767
Change-Id: Ia66e916007fd979d8e859bfeaefcadec8764378b
Chris Manton [Tue, 27 Apr 2021 20:53:14 +0000 (20:53 +0000)]
Break out BTM_LogHistory am:
29b895da4e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687430
Change-Id: I6ddd0c716358779b185777aa59026779cf70521d
Chris Manton [Tue, 27 Apr 2021 20:53:12 +0000 (20:53 +0000)]
Use proper types tBTM_BLE_SEC_ACT am:
026b94c40c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687429
Change-Id: Ib3c1483903b9c17bfb26f39b71013ab3b8ec7eb2
Chris Manton [Tue, 27 Apr 2021 20:53:10 +0000 (20:53 +0000)]
Enum-ify stack/include/btm/::tBTM_BLE_SEC_ACT am:
a82d7f97ce
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687428
Change-Id: Idcf3ee475ac132cfcd5138798ad36f52659be1e6
Zach Johnson [Tue, 27 Apr 2021 20:52:13 +0000 (20:52 +0000)]
Remove BLE_DELAY_REQUEST_ENC am:
f59ab5c7cf
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1406244
Change-Id: Ie360f2d695ba61ec9d225730b571733590478db2
Chris Manton [Tue, 27 Apr 2021 00:12:53 +0000 (17:12 -0700)]
Re-point main/test/ to use common test/mock
Toward testable code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I6f2d7a4a26858c416750bf35c47f70ec13f2f0f4
Mingguang Xu [Mon, 19 Apr 2021 20:27:19 +0000 (13:27 -0700)]
btaa: Add device-activity aggregation dumpsys data
1. Add create time into each aggregation entry; aggregation entry
expires after one day.
2. Add device-activity into dumpsys data; Trim down transient
aggregation entries to avoid the unordered map overgrows.
Tag: #feature
Bug:
185819535
Bug:
170315554
Test: mmma -j system/bt
Test: manually capture a bugreport and make sure btaa aggregation data
show up
BYPASS_LONG_LINES_REASON: consist with gd format
Change-Id: I02cc2057796661fa3625492eaf1a429e20da4951
Mingguang Xu [Fri, 16 Apr 2021 20:31:46 +0000 (13:31 -0700)]
btaa: HCI ACL/SCO/ISO data packets process
Parse ACL/SCO/ISO packets to get connection handle, match to device address, and attribute them to device-based activities.
Tag: #feature
Bug:
185596854
Bug:
170315554
Test: mmma -j system/bt
Test: manual
BYPASS_LONG_LINES_REASON: consist with gd format
Change-Id: Icb879814ee34700afa35ace1cdca8ff1e8f55fe4
Mingguang Xu [Thu, 15 Apr 2021 05:24:30 +0000 (22:24 -0700)]
btaa: gd: Add wakeup reason dumpsys data
Create a circular buffer for wakeup history and plumb wakeup history to
dumpsys.
Tag: #feature
Bug:
185037337
Bug:
170315554
Test: mmma -j system/bt
Test: manual
BYPASS_LONG_LINES_REASON: consist with gd format
Change-Id: I468ac585ed0cd3415176b5d9a373e9332efe4d99
Michael Sun [Wed, 6 Jan 2021 00:15:02 +0000 (00:15 +0000)]
btaa: attribute wakeup and wakelock duration over processed HCI buckets
Attach recorded BT wakeup to the first post-wakeup parsed HCI packet.
Distribute wakelock duration over bucketed HCI info based on
transmitted byte counts.
Tag: #feature
Bug:
177232907
BUG:
177228387
Test: verified locally BTAA aggregator updated with BT activities
BYPASS_LONG_LINES_REASON: consist with gd format
Change-Id: Idf93afcf13af9e76b4bc6f6ef30cf8424d8b4982
Michael Sun [Wed, 6 Jan 2021 00:14:36 +0000 (00:14 +0000)]
btaa: HCI LE and special event process
Implementation the HCI process for LE and special (events that contains
more than one device information) events.
Tag: #feature
Bug:
177230507
Test: verified locally BTAA can process LE and special events.
BYPASS_LONG_LINES_REASON: consist with gd format
Change-Id: If30069673bd6164b22af926ca17ea9830f891a8a
Michael Sun [Wed, 6 Jan 2021 00:13:11 +0000 (00:13 +0000)]
btaa: HCI classic event process
Introduce BTAA HCI event processing. This change only handles simple
(event that contains only one device information and do not require
additional processing )classic events. Command status and command
complete events will be associated with previous parsed HCI command.
The lookup table is a skelton implementation that does not contain 100%
correct information.
Tag: #feature
Bug:
177230507
Test: verified locally BTAA can partially process HCI events.
BYPASS_LONG_LINES_REASON: consist with gd format
Change-Id: Idd26318200cfd1f94596dd69083452dba5dff478
Michael Sun [Thu, 31 Dec 2020 01:00:18 +0000 (01:00 +0000)]
btaa: HCI command process
Introduce the first phase of BTAA HCI command process. Upon receives a
HCI command packet, processing module will search the opcode against a
lookup table, only simple (contains only device info) and identifiable
command will be processed. Pair information of connection handle and
device address are associated and recorded for future references.
The lookup table is a skelton implementation that does not contain 100%
correct information.
Tag: #feature
Bug:
177230507
Test: verified locally BTAA can partially process HCI commands
BYPASS_LONG_LINES_REASON: consist with gd format
Change-Id: I7c8640e60ffa06f45953403549d28dc530383bd9
Michael Sun [Thu, 31 Dec 2020 00:46:13 +0000 (00:46 +0000)]
btaa: handle wakelock notification
Handle wakelock acquire and release notification from system suspend
service and record the wakelock duration upon release.
Tag: #feature
Bug:
177232907
Test: verified locally BTAA can capture and timestamp BT wakelocks
BYPASS_LONG_LINES_REASON: consist with gd format
Change-Id: I51dfdbec62b66d5a93f45d8ea2c52a16ce3beec1
Chris Manton [Tue, 27 Apr 2021 16:26:42 +0000 (09:26 -0700)]
Re-include bta/vc/devices
Bug:
163134718
Test: cert
Tag: #refactor
Change-Id: Iae4b30484c2e0a38d5ac61875c1a80c6b04bd97f
Chris Manton [Tue, 20 Apr 2021 21:55:43 +0000 (14:55 -0700)]
shim: Add method to query stack manager for gd dumpsys module start
Bug:
182544206
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: Ib9bef0b07b5a2248ae4262537b4fa4a4f865e0e3
Chris Manton [Mon, 8 Feb 2021 23:57:43 +0000 (15:57 -0800)]
Break out BTM_LogHistory
Toward includable code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: Ibbb8d94783f131a0ad4e455b6a3e9e3861be0dfd
Chris Manton [Wed, 27 Jan 2021 17:22:07 +0000 (09:22 -0800)]
Use proper types tBTM_BLE_SEC_ACT
Toward readable code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: Iad6f664ff123e5cee858ef4fee9a7356a89df9c9
Chris Manton [Wed, 27 Jan 2021 17:25:47 +0000 (09:25 -0800)]
Enum-ify stack/include/btm/::tBTM_BLE_SEC_ACT
Toward readable code
Bug:
163134718
Test: gd/cert/run
Tag: #refactor
Change-Id: I91920ec11dfb0095f271cdda81b7bb1819a68431
Zach Johnson [Fri, 21 Aug 2020 16:51:09 +0000 (09:51 -0700)]
Remove BLE_DELAY_REQUEST_ENC
If it is enabled, the logic makes no sense.
The security flags are stored in 2 bytes.
The upper byte is LE security flags, and the lower byte is classic flags.
It is checking the classic flags to determine whether to start
BLE encryption.
It was false by default.
Bug:
159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ifabf514e20c2bc95d2f81a94158b8b63c5e2db6d
Abhishek Pandit-Subedi [Thu, 1 Apr 2021 22:33:05 +0000 (15:33 -0700)]
Change build.py ordering for rust and main
Rust now links to C++ instead of C++ to Rust so change the build
ordering to match.
Bug:
183208689
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: I71518b6efc9e45b880baeb2b7db16bbb0006a6e5
Sonny Sasaka [Tue, 27 Apr 2021 05:34:24 +0000 (22:34 -0700)]
Fixes for Linux build
Some fixes needed to build on Linux:
* Add missing C++ source files to BUILD.gn
* Add stubs in common/metrics_linux.cc
* Add Linux stub implementation of ActivityAttribution
* Add Linux stub for ParameterProvider::SnoozLogFilePath
* Add missing include files
Bug:
184975659
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: I37e6c3f593a95777c9c72bc9cda3da1e7ba466c0
Michael Sun [Thu, 31 Dec 2020 00:19:41 +0000 (00:19 +0000)]
btaa: handle wakeup notification
Compare the wakeup reason to verify if Bluetooth was the wakeup source
and record the wakeup event for future processing.
Tag: #feature
Bug:
177228387
Test: verified locally BTAA module receives and parses Bluetooth wakeup
reasons.
BYPASS_LONG_LINES_REASON: consist with gd format
Change-Id: I301d2a372ddaebdf0818e368019cb8043c2034c5
Chris Manton [Tue, 27 Apr 2021 02:22:25 +0000 (02:22 +0000)]
gd: Add module started query method am:
be73ad8daa
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1682667
Change-Id: I26ff6e1cb4170d2bfd06edd09aaf05315ac76b34
Myles Watson [Mon, 26 Apr 2021 23:59:56 +0000 (16:59 -0700)]
HCI: Add SetEventMaskPage2 Opcode
SetEventMaskPage2 is used for enabling/disabling
events for AMP. Although we don't support these,
we can support (ignore) the command to disable them.
Bug:
186458975
Test: cert/run
Tag: #gd-refactor
Change-Id: Ibe957895fb830baf93b796a6b375928884912e18
Chris Manton [Tue, 20 Apr 2021 21:01:17 +0000 (14:01 -0700)]
gd: Add module started query method
Bug:
182544206
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Change-Id: I7d2dedd4aaa20fd6811166c86d1b9931e6dda536
Chris Manton [Mon, 26 Apr 2021 22:07:08 +0000 (22:07 +0000)]
Remove unneeded header file gd/shim/only_..._ever am:
7c321ec80c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1682666
Change-Id: I0d992dbd7f2a865a45bbcb3ff1fe35e5a08326f9
Chris Manton [Mon, 26 Apr 2021 19:24:05 +0000 (19:24 +0000)]
gd: Use flushable attribute to packets am:
57a1cf77c2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1683480
Change-Id: Ie2b3a2f5589dff2bce4874d50e2ae230b1ceac9a
Chris Manton [Mon, 26 Apr 2021 19:24:02 +0000 (19:24 +0000)]
gd: Add flushable attribute to packets am:
9e418804ba
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1683479
Change-Id: I8067192b2ddc59e5193d99a9d0593965f5bc03d5
Chris Manton [Mon, 26 Apr 2021 19:23:59 +0000 (19:23 +0000)]
Introduce stack_hci_test am:
8c6b795334
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1683478
Change-Id: Id8d860fb66f9536c10ee6d010f7560046edbd80d