OSDN Git Service

android-x86/system-bt.git
3 years agoAdd include/hardware/bt_hh::bthh_connection_state_text am: df8fbbf2b6 am: e7d8d3d11d
Chris Manton [Mon, 3 May 2021 04:12:48 +0000 (04:12 +0000)]
Add include/hardware/bt_hh::bthh_connection_state_text am: df8fbbf2b6 am: e7d8d3d11d

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

Change-Id: I3cbc293c6d44021674e4891519f02c53b090401c

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

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

Change-Id: I918ddbf60a5d218bfd6e92ffaa3db969fbe46da5

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

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

Change-Id: Ib16fe986791317af8cb52676e9faf793d9e47603

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

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

Change-Id: Ib8f403e2176e36e75ed55aac99ca83ebccef37e6

3 years agoAdd include/hardware/bt_hh::bthh_connection_state_text am: df8fbbf2b6
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

3 years agoRemove unused declaration am: f260dc6e96
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

3 years agobtm_log: Streamline hid logging am: f7dd3dd0bf
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

3 years agolog: Swap proper initiator am: 0973f8d157
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

3 years agoAdd include/hardware/bt_hh::bthh_connection_state_text
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

3 years agoRemove unused declaration
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

3 years agobtm_log: Streamline hid logging
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

3 years agolog: Swap proper initiator
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

3 years agoMerge "ScanningManagerTest: Wait for the Filter command" am: 81ce4d3e70 am: c6c847e0ca
Treehugger Robot [Sat, 1 May 2021 20:53:26 +0000 (20:53 +0000)]
Merge "ScanningManagerTest: Wait for the Filter command" am: 81ce4d3e70 am: c6c847e0ca

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

Change-Id: I6f3b851850b352b4c332dff396307271f467c507

3 years agoGD: Split tests into module vs unit tests am: 479f99dcab am: 7dc3cfa2e7
Myles Watson [Sat, 1 May 2021 20:53:20 +0000 (20:53 +0000)]
GD: Split tests into module vs unit tests am: 479f99dcab am: 7dc3cfa2e7

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

Change-Id: I47f047c2fae5c3467a528b718e36b641364acc49

3 years agoMerge "ScanningManagerTest: Wait for the Filter command" am: 81ce4d3e70
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

3 years agoGD: Split tests into module vs unit tests am: 479f99dcab
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

3 years agoMerge "ScanningManagerTest: Wait for the Filter command"
Treehugger Robot [Sat, 1 May 2021 20:21:47 +0000 (20:21 +0000)]
Merge "ScanningManagerTest: Wait for the Filter command"

3 years agoScanningManagerTest: 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

3 years agoGD: Split tests into module vs unit tests
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

3 years agoEnable missing HCI cmds in rootcanal am: 1d73e8ba2d am: e58c9943ff
Erwin Jansen [Sat, 1 May 2021 01:01:06 +0000 (01:01 +0000)]
Enable missing HCI cmds in rootcanal am: 1d73e8ba2d am: e58c9943ff

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

Change-Id: Id69b363f8eb703899e57acedb3b267bf97aca244

3 years agoEnable missing HCI cmds in rootcanal am: 1d73e8ba2d
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

3 years agoMerge "ACL: Delay early RoleChange until after a ConnectionComplete" am: caa93c7426...
Treehugger Robot [Fri, 30 Apr 2021 22:53:25 +0000 (22:53 +0000)]
Merge "ACL: Delay early RoleChange until after a ConnectionComplete" am: caa93c7426 am: 4daf80a5b9

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

Change-Id: Ibac55ce74f69ea4546d25f526630e795329aa290

3 years agoEnable missing HCI cmds in rootcanal
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

3 years agoMerge "ACL: Delay early RoleChange until after a ConnectionComplete" am: caa93c7426
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

3 years agoMerge "ACL: Delay early RoleChange until after a ConnectionComplete"
Treehugger Robot [Fri, 30 Apr 2021 22:12:41 +0000 (22:12 +0000)]
Merge "ACL: Delay early RoleChange until after a ConnectionComplete"

3 years agoMerge "Compilation fixes for MSVC" am: 4e04984bb3 am: 5e9105e82b
Erwin Jansen [Fri, 30 Apr 2021 22:06:04 +0000 (22:06 +0000)]
Merge "Compilation fixes for MSVC" am: 4e04984bb3 am: 5e9105e82b

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

Change-Id: I02237afcc46bf479c2cd3ab349941ae6b8851adb

3 years agoMerge "Compilation fixes for MSVC" am: 4e04984bb3
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

3 years agoMerge changes I02cc2057,Icb879814,I468ac585,Idf93afcf,If3006967, ... am: f54f80ed1e...
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

3 years agoMerge "Compilation fixes for MSVC"
Erwin Jansen [Fri, 30 Apr 2021 21:35:37 +0000 (21:35 +0000)]
Merge "Compilation fixes for MSVC"

3 years agoMerge changes I02cc2057,Icb879814,I468ac585,Idf93afcf,If3006967, ... am: f54f80ed1e
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

3 years agoMerge changes I02cc2057,Icb879814,I468ac585,Idf93afcf,If3006967, ...
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

3 years agoACL: Delay early RoleChange until after a ConnectionComplete
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

3 years agoMerge "gd: Implement batch scan" am: cbe859c150 am: d4466da865
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

3 years agoMerge "gd: Implement batch scan" am: cbe859c150
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

3 years agoMerge "gd: Implement batch scan"
Myles Watson [Fri, 30 Apr 2021 15:25:39 +0000 (15:25 +0000)]
Merge "gd: Implement batch scan"

3 years agoDisable SecurityRecordStorageTests am: 8bac0c8d52 am: c58b7690ca
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

3 years agoDisable SecurityRecordStorageTests am: 8bac0c8d52
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

3 years agoDisable SecurityRecordStorageTests
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

3 years ago[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write...
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

3 years ago[automerger skipped] Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev...
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

3 years ago[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write...
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

3 years ago[automerger skipped] Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev...
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

3 years ago[automerger skipped] RESTRICT AUTOMERGE Contain avrc_ctrl_pars_vendor_cmd OOB write...
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

3 years ago[automerger skipped] Merge "AVRCP: pass bdaddr by value when use SdpCb" into pi-dev...
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

3 years agoMerge "OOB: generateLocalOobdata()" am: 89d078cf99 am: 2e4d9ac7a7
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

3 years agoMerge "gd: Find and fill TX Power with the correct value" am: d348c92a3a am: 0d629a20dd
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

3 years agoDon't try to do read multiple procedure if only one attribute is to read am: f0f323c9...
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

3 years agoMerge "OOB: generateLocalOobdata()" am: 89d078cf99
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

3 years agoMerge "gd: Find and fill TX Power with the correct value" am: d348c92a3a
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

3 years agoDon't try to do read multiple procedure if only one attribute is to read am: f0f323c98c
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

3 years agoMerge "OOB: generateLocalOobdata()"
Martin Brabham [Thu, 29 Apr 2021 18:51:28 +0000 (18:51 +0000)]
Merge "OOB: generateLocalOobdata()"

3 years agoMerge "gd: Find and fill TX Power with the correct value"
Treehugger Robot [Thu, 29 Apr 2021 18:33:26 +0000 (18:33 +0000)]
Merge "gd: Find and fill TX Power with the correct value"

3 years agoDon't try to do read multiple procedure if only one attribute is to read
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

3 years agogd: Implement batch scan
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

3 years agogd: Find and fill TX Power with the correct value
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

3 years agoMerge "Change build.py ordering for rust and main" am: 6a2c03267e am: fb9ceed0e1
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

3 years agoMerge "Fixes for Linux build" am: 22a183c1f9 am: 021ca6d985
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

3 years agoMerge "Change build.py ordering for rust and main" am: 6a2c03267e
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

3 years agoMerge "Fixes for Linux build" am: 22a183c1f9
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

3 years agoMerge "Change build.py ordering for rust and main"
Sonny Sasaka [Thu, 29 Apr 2021 05:24:19 +0000 (05:24 +0000)]
Merge "Change build.py ordering for rust and main"

3 years agoMerge "Fixes for Linux build"
Sonny Sasaka [Thu, 29 Apr 2021 05:23:48 +0000 (05:23 +0000)]
Merge "Fixes for Linux build"

3 years agoFix for hid disconnect with unknown channel am: d6c80b565b am: 44fc797c9f
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

3 years agoKonstify configurable params kHID_HOST_MAX_DEVICES am: 828bb060ba am: ee3897e617
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

3 years agoAdd test legacy trace stub am: 0d6ef5aee5 am: 4e1686ee18
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

3 years agoRe-include stack/hid/hidh_int am: 81a6d36b91 am: 672608107c
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

3 years agoRe-include stack/hid/hidd_int am: 6c023bee12 am: 8b7ab95beb
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

3 years agoDecl-def same line stack var stack/hid/::tHID_CONN am: e909785521 am: 2bb3847298
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

3 years agoRe-log stack/btm/btm_sec::btm_sec_l2cap_access_req_by_requirement am: aa908a4341...
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

3 years agoFix for hid disconnect with unknown channel am: d6c80b565b
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

3 years agoKonstify configurable params kHID_HOST_MAX_DEVICES am: 828bb060ba
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

3 years agoAdd test legacy trace stub am: 0d6ef5aee5
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

3 years agoRe-include stack/hid/hidh_int am: 81a6d36b91
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

3 years agoRe-include stack/hid/hidd_int am: 6c023bee12
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

3 years agoDecl-def same line stack var stack/hid/::tHID_CONN am: e909785521
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

3 years agoRe-log stack/btm/btm_sec::btm_sec_l2cap_access_req_by_requirement am: aa908a4341
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

3 years agoFix for hid disconnect with unknown channel
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

3 years agoKonstify configurable params kHID_HOST_MAX_DEVICES
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

3 years agoAdd test legacy trace stub
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

3 years agoRe-include stack/hid/hidh_int
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

3 years agoRe-include stack/hid/hidd_int
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

3 years agoDecl-def same line stack var stack/hid/::tHID_CONN
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

3 years agoRe-log stack/btm/btm_sec::btm_sec_l2cap_access_req_by_requirement
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

3 years agoMerge "BluetoothMetrics: Remove MetricIdAllocator reference from HalCrashReason"...
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

3 years agoshim: Check if dumpsys module has started before invoking am: 932e7f65c3 am: ccf6f2f22b
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

3 years agoMerge "BluetoothMetrics: Remove MetricIdAllocator reference from HalCrashReason"...
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

3 years agoshim: Check if dumpsys module has started before invoking am: 932e7f65c3
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

3 years agoMerge "BluetoothMetrics: Remove MetricIdAllocator reference from HalCrashReason"
Chen Chen [Wed, 28 Apr 2021 17:07:47 +0000 (17:07 +0000)]
Merge "BluetoothMetrics: Remove MetricIdAllocator reference from HalCrashReason"

3 years agoOOB: generateLocalOobdata()
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

3 years agoMerge "shim: Add entry to query gd dumpsys module" am: 0bab3cd415 am: 73894677d1
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

3 years agoMerge "shim: Add entry to query gd dumpsys module" am: 0bab3cd415
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

3 years agoshim: Check if dumpsys module has started before invoking
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

3 years agoMerge "shim: Add entry to query gd dumpsys module"
Chris Manton [Wed, 28 Apr 2021 04:14:36 +0000 (04:14 +0000)]
Merge "shim: Add entry to query gd dumpsys module"

3 years agoMerge "GD: Add LogBluetoothHalCrashReason" am: d51c922278 am: 5d0f5dfe5e
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

3 years agoMerge "GD: Add LogBluetoothHalCrashReason" am: d51c922278
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

3 years agoMerge "GD: Add LogBluetoothHalCrashReason"
Weichin Weng [Wed, 28 Apr 2021 02:17:35 +0000 (02:17 +0000)]
Merge "GD: Add LogBluetoothHalCrashReason"

3 years agoBluetoothMetrics: Remove MetricIdAllocator reference from HalCrashReason
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

3 years agoMerge "HCI: Add SetEventMaskPage2 Opcode" am: b68e9e5c78 am: e24b201892
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

3 years agoMerge "HCI: Add SetEventMaskPage2 Opcode" am: b68e9e5c78
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

3 years agoMerge "HCI: Add SetEventMaskPage2 Opcode"
Myles Watson [Wed, 28 Apr 2021 00:50:41 +0000 (00:50 +0000)]
Merge "HCI: Add SetEventMaskPage2 Opcode"

3 years agoGD: Add LogBluetoothHalCrashReason
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