OSDN Git Service
Treehugger Robot [Fri, 30 Apr 2021 21:43:10 +0000 (21:43 +0000)]
Merge changes I02cc2057,Icb879814,I468ac585,Idf93afcf,If3006967, ... am:
f54f80ed1e am:
a6efacd756
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1680525
Change-Id: I26348633e74d6db045dd66692aa46c81e68d9faa
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 [Fri, 30 Apr 2021 16:14:51 +0000 (16:14 +0000)]
Merge "gd: Implement batch scan" am:
cbe859c150 am:
d4466da865
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1688307
Change-Id: I2026e26e11035e6fea46fb025689dceeaf111038
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 01:00:01 +0000 (01:00 +0000)]
Disable SecurityRecordStorageTests am:
8bac0c8d52 am:
c58b7690ca
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690695
Change-Id: I0d788fae255408fbced005956f63fe9bbf6d4889
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
Chris Manton [Thu, 29 Apr 2021 22:36:45 +0000 (22:36 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
2901716406 -s ours am:
98e2be17dd am:
0659d4ab56 -s ours am:
344adb8765 am:
1d877974bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954700
Change-Id: I30be69541d799a9abb31e178fa6c735fc104111c
TreeHugger Robot [Thu, 29 Apr 2021 22:36:39 +0000 (22:36 +0000)]
[automerger skipped] Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev am:
529b824a10 am:
0c4a707110 am:
b44e756312 -s ours am:
034a93aada -s ours am:
0e49324ed3 -s ours
am skip reason: Merged-In I7f5b2a3dd0540a922b64ce213d871d355bd6dac6 with SHA-1
71c573ae67 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13516705
Change-Id: Ic22d6d2e72a33c71cc99ebf624091873d377ecec
Chris Manton [Thu, 29 Apr 2021 22:21:23 +0000 (22:21 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
2901716406 -s ours am:
98e2be17dd am:
0659d4ab56 -s ours am:
344adb8765
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954700
Change-Id: I94625a04a7610fff5806b9587ae92dd4694e4f48
TreeHugger Robot [Thu, 29 Apr 2021 22:21:19 +0000 (22:21 +0000)]
[automerger skipped] Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev am:
529b824a10 am:
0c4a707110 am:
b44e756312 -s ours am:
034a93aada -s ours
am skip reason: Merged-In I7f5b2a3dd0540a922b64ce213d871d355bd6dac6 with SHA-1
71c573ae67 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13516705
Change-Id: I70b12a2c5e71b73e413d4825a5ae518ad92e2841
Chris Manton [Thu, 29 Apr 2021 21:59:46 +0000 (21:59 +0000)]
[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write am:
2901716406 -s ours am:
98e2be17dd am:
0659d4ab56 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13954700
Change-Id: Ic4bb2c4615c9b1501aae916026387f3bf7714170
TreeHugger Robot [Thu, 29 Apr 2021 21:59:34 +0000 (21:59 +0000)]
[automerger skipped] Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev am:
529b824a10 am:
0c4a707110 am:
b44e756312 -s ours
am skip reason: Merged-In I7f5b2a3dd0540a922b64ce213d871d355bd6dac6 with SHA-1
71c573ae67 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
13516705
Change-Id: Iab9c72d42c690266379a05974b868ee5bfd0eb24
Martin Brabham [Thu, 29 Apr 2021 21:10:21 +0000 (21:10 +0000)]
Merge "OOB: generateLocalOobdata()" am:
89d078cf99 am:
2e4d9ac7a7
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1677348
Change-Id: I12940d922c70fc6a3d001725bd5b8004b412d188
Treehugger Robot [Thu, 29 Apr 2021 21:09:58 +0000 (21:09 +0000)]
Merge "gd: Find and fill TX Power with the correct value" am:
d348c92a3a am:
0d629a20dd
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1689575
Change-Id: Ic3bde5dc792f0fe397168beeea55a088bb5fda34
Grzegorz Kołodziejczyk [Thu, 29 Apr 2021 21:09:53 +0000 (21:09 +0000)]
Don't try to do read multiple procedure if only one attribute is to read am:
f0f323c98c am:
8ff0ac0ca8
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690792
Change-Id: Iecd18bbbb6ecb1deeb91d36fed03ed0aba0f5a04
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 06:21:39 +0000 (06:21 +0000)]
Merge "Change build.py ordering for rust and main" am:
6a2c03267e am:
fb9ceed0e1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1668070
Change-Id: Ibd0c00b4f77bc1e8021d3370c3aa6939316de1f3
Sonny Sasaka [Thu, 29 Apr 2021 06:21:34 +0000 (06:21 +0000)]
Merge "Fixes for Linux build" am:
22a183c1f9 am:
021ca6d985
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687437
Change-Id: Id7316ae8f32d0b8f31350b03f7727a23c289b8fd
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:45:31 +0000 (03:45 +0000)]
Fix for hid disconnect with unknown channel am:
d6c80b565b am:
44fc797c9f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690102
Change-Id: I799909f62a6c86ecff36a57ed46aa1b107ff31a3
Chris Manton [Thu, 29 Apr 2021 03:45:30 +0000 (03:45 +0000)]
Konstify configurable params kHID_HOST_MAX_DEVICES am:
828bb060ba am:
ee3897e617
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690101
Change-Id: Ib49bdded7e27f4e9f6f3facd66620af6dee8f47c
Chris Manton [Thu, 29 Apr 2021 03:45:29 +0000 (03:45 +0000)]
Add test legacy trace stub am:
0d6ef5aee5 am:
4e1686ee18
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690100
Change-Id: I28837c022d1680815af1bff284a1e74a5fb0d7c2
Chris Manton [Thu, 29 Apr 2021 03:45:28 +0000 (03:45 +0000)]
Re-include stack/hid/hidh_int am:
81a6d36b91 am:
672608107c
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690099
Change-Id: I5b093f9c40bc3dda96633696c7ee2e1812ac4891
Chris Manton [Thu, 29 Apr 2021 03:45:27 +0000 (03:45 +0000)]
Re-include stack/hid/hidd_int am:
6c023bee12 am:
8b7ab95beb
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690098
Change-Id: I0d5a11f67ba85e4933e52ff6d7a3bac2686b7cfc
Chris Manton [Thu, 29 Apr 2021 03:45:26 +0000 (03:45 +0000)]
Decl-def same line stack var stack/hid/::tHID_CONN am:
e909785521 am:
2bb3847298
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1690097
Change-Id: I7c01867580db78f6ce025eb451c8ffce358030ae
Chris Manton [Thu, 29 Apr 2021 03:45:23 +0000 (03:45 +0000)]
Re-log stack/btm/btm_sec::btm_sec_l2cap_access_req_by_requirement am:
aa908a4341 am:
263477eee2
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1676596
Change-Id: I4ca8e74096b86c42cf00aca7d268587c8a305ae9
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:55:37 +0000 (19:55 +0000)]
Merge "BluetoothMetrics: Remove MetricIdAllocator reference from HalCrashReason" am:
fff897e016 am:
b954684dea
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1688816
Change-Id: I5aca04e4bfa1f6b5d299204b68e398a25a1bd046
Chris Manton [Wed, 28 Apr 2021 19:55:23 +0000 (19:55 +0000)]
shim: Check if dumpsys module has started before invoking am:
932e7f65c3 am:
ccf6f2f22b
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1682670
Change-Id: I88372be6255bfc3fbace1a160e968cc373660879
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:44:34 +0000 (04:44 +0000)]
Merge "shim: Add entry to query gd dumpsys module" am:
0bab3cd415 am:
73894677d1
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1682669
Change-Id: I3abe8797d139e7981de8b24d644e66ec67645194
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 03:05:53 +0000 (03:05 +0000)]
Merge "GD: Add LogBluetoothHalCrashReason" am:
d51c922278 am:
5d0f5dfe5e
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687625
Change-Id: Ie0391e5b450dbec5054230a9305a2b0c5237f653
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:31:29 +0000 (01:31 +0000)]
Merge "HCI: Add SetEventMaskPage2 Opcode" am:
b68e9e5c78 am:
e24b201892
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687245
Change-Id: I59b940ed945933bc60c639f4d3faf45a5a6b876d
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:54:14 +0000 (21:54 +0000)]
Merge "shim: Add method to query stack manager for gd dumpsys module start" am:
070516726e am:
1b2a03d53a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1682668
Change-Id: I61d451e2c6dd74d08d3c180d84fe75f60d5ca91c
Chris Manton [Tue, 27 Apr 2021 21:39:31 +0000 (21:39 +0000)]
Re-point main/test/ to use common test/mock am:
3a92009d3b am:
5bc2883cbc
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687431
Change-Id: I4ff090431bf540cf2d39c5bad1cc826c928bea20
Chris Manton [Tue, 27 Apr 2021 21:39:30 +0000 (21:39 +0000)]
Re-include bta/vc/devices am:
633d92d79e am:
7b4a72561a
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1688767
Change-Id: I580072b4c5bb306a82bc7b1fac33fd89b06a7e22
Chris Manton [Tue, 27 Apr 2021 21:39:29 +0000 (21:39 +0000)]
Break out BTM_LogHistory am:
29b895da4e am:
7d85cb8c2f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687430
Change-Id: I9ae8aca16bc5574210d31f0a01f488a8c08cc8df
Chris Manton [Tue, 27 Apr 2021 21:39:29 +0000 (21:39 +0000)]
Use proper types tBTM_BLE_SEC_ACT am:
026b94c40c am:
7513a2151f
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687429
Change-Id: Iccb067a49f2d2950a724d0584a2ff210c24c7020
Chris Manton [Tue, 27 Apr 2021 21:39:28 +0000 (21:39 +0000)]
Enum-ify stack/include/btm/::tBTM_BLE_SEC_ACT am:
a82d7f97ce am:
6444442f7d
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1687428
Change-Id: I1b9d65489c59366c7170f49007d6bb2e57283aad
Zach Johnson [Tue, 27 Apr 2021 21:39:26 +0000 (21:39 +0000)]
Remove BLE_DELAY_REQUEST_ENC am:
f59ab5c7cf am:
a10a3a8406
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/
1406244
Change-Id: Ic81d4b47d5a7a9545abd3605bbdf9421d8f73e8d
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
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