OSDN Git Service

android-x86/system-bt.git
3 years agoMerge changes I9b41e751,If93d4d62 am: e42776fefe am: dfb2127ad3
Zach Johnson [Wed, 18 Nov 2020 17:40:11 +0000 (17:40 +0000)]
Merge changes I9b41e751,If93d4d62 am: e42776fefe am: dfb2127ad3

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

Change-Id: I6251fc3a412e192b935a370246d704522158acb6

3 years agoMerge "RootCanal: Allow only the peer to have OOB data" am: 00bc7f3b95 am: f55ae86565
Treehugger Robot [Wed, 18 Nov 2020 17:39:50 +0000 (17:39 +0000)]
Merge "RootCanal: Allow only the peer to have OOB data" am: 00bc7f3b95 am: f55ae86565

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

Change-Id: I0942ffab6aed892d398f1fe09b417894e2906169

3 years agoMerge changes I9b41e751,If93d4d62 am: e42776fefe
Zach Johnson [Wed, 18 Nov 2020 17:28:32 +0000 (17:28 +0000)]
Merge changes I9b41e751,If93d4d62 am: e42776fefe

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

Change-Id: Idbb83d3c4669a790d87cb67211771f23669f5289

3 years agoMerge "RootCanal: Allow only the peer to have OOB data" am: 00bc7f3b95
Treehugger Robot [Wed, 18 Nov 2020 17:28:22 +0000 (17:28 +0000)]
Merge "RootCanal: Allow only the peer to have OOB data" am: 00bc7f3b95

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

Change-Id: Ie2fb5b7639f7d9a97084c6713f63f7a1705b9c63

3 years agoMerge changes I9b41e751,If93d4d62
Zach Johnson [Wed, 18 Nov 2020 17:20:31 +0000 (17:20 +0000)]
Merge changes I9b41e751,If93d4d62

* changes:
  rusty-gd: plumb through ACL in the hal
  rusty-gd: plumb through commands and events for the hci hal facade

3 years agoMerge "RootCanal: Allow only the peer to have OOB data"
Treehugger Robot [Wed, 18 Nov 2020 17:08:57 +0000 (17:08 +0000)]
Merge "RootCanal: Allow only the peer to have OOB data"

3 years agoMerge "shim: check subevent for advertising module" am: d675419563 am: 06a17beab3
Treehugger Robot [Wed, 18 Nov 2020 06:30:42 +0000 (06:30 +0000)]
Merge "shim: check subevent for advertising module" am: d675419563 am: 06a17beab3

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

Change-Id: I8dde8b3162e53cd7af92988e5e26b604d89d9a3d

3 years agoMerge "shim: check subevent for advertising module" am: d675419563
Treehugger Robot [Wed, 18 Nov 2020 06:17:18 +0000 (06:17 +0000)]
Merge "shim: check subevent for advertising module" am: d675419563

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

Change-Id: I326f2fd655b20bf3735df4e4879435feded83ddb

3 years agoMerge "shim: check subevent for advertising module"
Treehugger Robot [Wed, 18 Nov 2020 05:56:49 +0000 (05:56 +0000)]
Merge "shim: check subevent for advertising module"

3 years agoHci layer: Minor clean up am: 96ed87bb6a am: 7290083f6a
Hansong Zhang [Wed, 18 Nov 2020 03:25:50 +0000 (03:25 +0000)]
Hci layer: Minor clean up am: 96ed87bb6a am: 7290083f6a

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

Change-Id: I05cfdc48b337d2057e892d97b0f2f1fdc4a41f3e

3 years agoRootCanal: Allow only the peer to have OOB data
Myles Watson [Wed, 18 Nov 2020 03:02:43 +0000 (19:02 -0800)]
RootCanal: Allow only the peer to have OOB data

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

3 years agoHci layer: Minor clean up am: 96ed87bb6a
Hansong Zhang [Wed, 18 Nov 2020 03:03:21 +0000 (03:03 +0000)]
Hci layer: Minor clean up am: 96ed87bb6a

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

Change-Id: I6f3f3ce8d626b676990e406b6a23cb98ae3eaaf5

3 years agoHci layer: Minor clean up
Hansong Zhang [Tue, 17 Nov 2020 23:05:15 +0000 (15:05 -0800)]
Hci layer: Minor clean up

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Change-Id: I5498e56285a6523d0ce3199777c5677e9fdf6bbc

3 years agoMerge "enum-ify stack/include/bt_types::BT_PSM_" am: 002d2025db am: 6ea19a5ec6
Chris Manton [Wed, 18 Nov 2020 01:13:56 +0000 (01:13 +0000)]
Merge "enum-ify stack/include/bt_types::BT_PSM_" am: 002d2025db am: 6ea19a5ec6

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

Change-Id: Ifea11e4c76ec47caacc49cc0aefd7aa96870ab7c

3 years agoL2cap shim improvement am: b2a3ce4a4f am: 404ffb6662
Hansong Zhang [Wed, 18 Nov 2020 01:13:44 +0000 (01:13 +0000)]
L2cap shim improvement am: b2a3ce4a4f am: 404ffb6662

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

Change-Id: Ia993ea348893c7f7800acf6a70817ad8c9d7fa70

3 years agoL2cap shim: Add role switch am: 505b823e81 am: 28bdd68fde
Hansong Zhang [Wed, 18 Nov 2020 01:13:32 +0000 (01:13 +0000)]
L2cap shim: Add role switch am: 505b823e81 am: 28bdd68fde

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

Change-Id: I8bb61b2f50ecfdd96976ef430762add51a3d8833

3 years agoMerge "enum-ify stack/include/bt_types::BT_PSM_" am: 002d2025db
Chris Manton [Wed, 18 Nov 2020 01:12:52 +0000 (01:12 +0000)]
Merge "enum-ify stack/include/bt_types::BT_PSM_" am: 002d2025db

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

Change-Id: Icdd2fed488065d28633f374daa0028afbf0d5bf5

3 years agoMerge "enum-ify stack/include/bt_types::BT_PSM_"
Chris Manton [Wed, 18 Nov 2020 00:50:23 +0000 (00:50 +0000)]
Merge "enum-ify stack/include/bt_types::BT_PSM_"

3 years agoL2cap shim improvement am: b2a3ce4a4f
Hansong Zhang [Wed, 18 Nov 2020 00:47:53 +0000 (00:47 +0000)]
L2cap shim improvement am: b2a3ce4a4f

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

Change-Id: I6cdffee424b31f4a96924fb4e07b4432fafab527

3 years agoL2cap shim: Add role switch am: 505b823e81
Hansong Zhang [Wed, 18 Nov 2020 00:47:04 +0000 (00:47 +0000)]
L2cap shim: Add role switch am: 505b823e81

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

Change-Id: I71e9b334e3a659c64362c3ac6ac65b3c75934167

3 years agoL2cap shim improvement
Hansong Zhang [Thu, 5 Nov 2020 23:41:54 +0000 (15:41 -0800)]
L2cap shim improvement

Implement ReadRemoteVersion in L2cap shim.
Notify BTA layer directly when connection is up/down.

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Test: Pair and connect with a headset
Change-Id: I193bb24c52f06039359aeda84d68f429d60bf33b

3 years agoL2cap shim: Add role switch
Hansong Zhang [Thu, 5 Nov 2020 23:35:45 +0000 (15:35 -0800)]
L2cap shim: Add role switch

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

3 years agoenum-ify stack/include/bt_types::BT_PSM_
Chris Manton [Fri, 13 Nov 2020 23:55:42 +0000 (15:55 -0800)]
enum-ify stack/include/bt_types::BT_PSM_

Toward readable code

Bug: 163134718
Tag: #refactor
Test: CtsVerifier

Change-Id: Icf24f483a807c28763bf677f5d01b13cc3c9c553

3 years agoacl: Implement ReadRemoteVersionInformation for LE am: 069cec9494 am: e79f147f94
Myles Watson [Tue, 17 Nov 2020 21:24:29 +0000 (21:24 +0000)]
acl: Implement ReadRemoteVersionInformation for LE am: 069cec9494 am: e79f147f94

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

Change-Id: I5eefdcf76114a6b03ff8a0a722ae9dc32972e80f

3 years agoacl: Remove DisconnectorForLe am: c74a4365cb am: 486dfe939c
Myles Watson [Tue, 17 Nov 2020 21:24:07 +0000 (21:24 +0000)]
acl: Remove DisconnectorForLe am: c74a4365cb am: 486dfe939c

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

Change-Id: Ib427eb49fe1aa6056a4e1b2442c966d6402a9040

3 years agoacl: Implement ReadRemoteVersionInformation for LE am: 069cec9494
Myles Watson [Tue, 17 Nov 2020 20:51:09 +0000 (20:51 +0000)]
acl: Implement ReadRemoteVersionInformation for LE am: 069cec9494

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

Change-Id: I585de35c23e7a8ddb851803c22b0254cde05274e

3 years agoacl: Remove DisconnectorForLe am: c74a4365cb
Myles Watson [Tue, 17 Nov 2020 20:50:54 +0000 (20:50 +0000)]
acl: Remove DisconnectorForLe am: c74a4365cb

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

Change-Id: I6e35b8638ea8ad9def089a1781491e6fc24e57e5

3 years agoAdd AclCommands for LE and BR/EDR am: d8817d9c21 am: 46342c498a
Myles Watson [Tue, 17 Nov 2020 19:13:05 +0000 (19:13 +0000)]
Add AclCommands for LE and BR/EDR am: d8817d9c21 am: 46342c498a

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

Change-Id: I0b5f08556236d7494edb6ff5ac7b68f9b2fbbd6b

3 years agoAdd AclCommands for LE and BR/EDR am: d8817d9c21
Myles Watson [Tue, 17 Nov 2020 18:58:57 +0000 (18:58 +0000)]
Add AclCommands for LE and BR/EDR am: d8817d9c21

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

Change-Id: I093d3c23a79a0ea9cd4de78bb8917abf544c60d1

3 years agorusty-gd: plumb through ACL in the hal
Zach Johnson [Thu, 12 Nov 2020 01:43:29 +0000 (17:43 -0800)]
rusty-gd: plumb through ACL in the hal

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: I9b41e7515384d062155dbb414ce79394c1abcd36

3 years agorusty-gd: plumb through commands and events for the hci hal facade
Zach Johnson [Wed, 11 Nov 2020 23:19:48 +0000 (15:19 -0800)]
rusty-gd: plumb through commands and events for the hci hal facade

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost SimpleHalTest
Change-Id: If93d4d62e3c4d030fdf94082172c00dcb2ca47e8

3 years agoacl: Implement ReadRemoteVersionInformation for LE
Myles Watson [Tue, 17 Nov 2020 17:35:54 +0000 (09:35 -0800)]
acl: Implement ReadRemoteVersionInformation for LE

Bug: 172725986
Test: atest bluetooth_test_gd
Tag: #gd-refactor
Change-Id: I114c5510ea8396244c68b11b333249092333cff9

3 years agoacl: Remove DisconnectorForLe
Myles Watson [Tue, 17 Nov 2020 15:30:54 +0000 (07:30 -0800)]
acl: Remove DisconnectorForLe

Bug: 172725986
Test: atest bluetooth_test_gd
Tag: #gd-refactor
Change-Id: Id9a5dcbba3f4be0490baa13d3ff538f0f2158c5c

3 years agoAdd AclCommands for LE and BR/EDR
Myles Watson [Tue, 17 Nov 2020 05:24:21 +0000 (21:24 -0800)]
Add AclCommands for LE and BR/EDR

Bug: 172725986
Test: atest bluetooth_test_gd
Tag: #gd-refactor
Change-Id: I822ce0751be08a98a30c219853e1540e2e461a08

3 years agoMerge "hci: Close linter IfChange block" am: 9e200db844 am: abf4736287
Treehugger Robot [Tue, 17 Nov 2020 07:55:25 +0000 (07:55 +0000)]
Merge "hci: Close linter IfChange block" am: 9e200db844 am: abf4736287

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

Change-Id: Ibcaa1eae86cf50d9393c1135eb5b51800f5395ff

3 years agoMerge "hci: Close linter IfChange block" am: 9e200db844
Treehugger Robot [Tue, 17 Nov 2020 07:40:09 +0000 (07:40 +0000)]
Merge "hci: Close linter IfChange block" am: 9e200db844

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

Change-Id: I0f32129b7bfbec89cd81867961a0c13fb0c813f1

3 years agoMerge "hci: Close linter IfChange block"
Treehugger Robot [Tue, 17 Nov 2020 07:03:43 +0000 (07:03 +0000)]
Merge "hci: Close linter IfChange block"

3 years agohci: Close linter IfChange block
Myles Watson [Tue, 17 Nov 2020 05:34:20 +0000 (21:34 -0800)]
hci: Close linter IfChange block

Bug: 172725986
Test: Upload CL and look for the linter complaining
Tag: #gd-refactor
Change-Id: Iadc778588d6ef95253c1efa4459c39feca845498

3 years agoMerge "btaa: do not initialize btaa module if init flag set to false" am: aba2e1297f...
Treehugger Robot [Tue, 17 Nov 2020 02:02:54 +0000 (02:02 +0000)]
Merge "btaa: do not initialize btaa module if init flag set to false" am: aba2e1297f am: b5c9645969

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

Change-Id: Ia685a7f101c619de25c864be493645f9c097ebcf

3 years agoMerge "btaa: do not initialize btaa module if init flag set to false" am: aba2e1297f
Treehugger Robot [Tue, 17 Nov 2020 01:48:59 +0000 (01:48 +0000)]
Merge "btaa: do not initialize btaa module if init flag set to false" am: aba2e1297f

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

Change-Id: Id4c226e3d843e7d321be2a4cd31141dae2613255

3 years agoMerge "btaa: do not initialize btaa module if init flag set to false"
Treehugger Robot [Tue, 17 Nov 2020 01:06:41 +0000 (01:06 +0000)]
Merge "btaa: do not initialize btaa module if init flag set to false"

3 years agoMerge "btaa: null check btaa instance when receiving callback from SystemSuspend...
Treehugger Robot [Tue, 17 Nov 2020 00:25:32 +0000 (00:25 +0000)]
Merge "btaa: null check btaa instance when receiving callback from SystemSuspend" am: f19cd47609 am: 4d37661176

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

Change-Id: I0eaadd9d9c434c37f51babddf46503df1ed66244

3 years agoMerge "btaa: null check btaa instance when receiving callback from SystemSuspend...
Treehugger Robot [Mon, 16 Nov 2020 23:54:17 +0000 (23:54 +0000)]
Merge "btaa: null check btaa instance when receiving callback from SystemSuspend" am: f19cd47609

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

Change-Id: I94b071811ed85a3f2603eb66de2e0f83563ce725

3 years agoMerge "SecurityManager: Add CreateBondOutOfBand interface." am: 0c4fb72a70 am: 970d2be67e
Treehugger Robot [Mon, 16 Nov 2020 23:26:01 +0000 (23:26 +0000)]
Merge "SecurityManager: Add CreateBondOutOfBand interface." am: 0c4fb72a70 am: 970d2be67e

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

Change-Id: If321a6f46f37e1f65d877299118c6d0281b6662c

3 years agoMerge "GD Security OobData" am: 59d606e5fd am: 34672a2ffe
Treehugger Robot [Mon, 16 Nov 2020 23:23:52 +0000 (23:23 +0000)]
Merge "GD Security OobData" am: 59d606e5fd am: 34672a2ffe

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

Change-Id: I1ec7d5b6a8cdd8ffb4a15b8d9f8cff8f0424651f

3 years agoMerge changes I4386b836,I27e6b6ce,I84842b13 am: 5c2f0c233c am: 3e8d18af25
Treehugger Robot [Mon, 16 Nov 2020 23:21:40 +0000 (23:21 +0000)]
Merge changes I4386b836,I27e6b6ce,I84842b13 am: 5c2f0c233c am: 3e8d18af25

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

Change-Id: I9878b24cb86e1a0f23f302ef23d9c3c73d88f00c

3 years agoMerge changes I53b512b1,I1be0028c,Iabd6b355,I7d3ccb15 am: 4179e0131a am: 10860657d2
Myles Watson [Mon, 16 Nov 2020 23:17:30 +0000 (23:17 +0000)]
Merge changes I53b512b1,I1be0028c,Iabd6b355,I7d3ccb15 am: 4179e0131a am: 10860657d2

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

Change-Id: I7c368743e855aefa6a2fbfdf0e75436cee0332da

3 years agoMerge "btaa: null check btaa instance when receiving callback from SystemSuspend"
Treehugger Robot [Mon, 16 Nov 2020 23:17:24 +0000 (23:17 +0000)]
Merge "btaa: null check btaa instance when receiving callback from SystemSuspend"

3 years agoMerge "rusty-gd: switch added services based on module under test" am: 71a9cf700d...
Zach Johnson [Mon, 16 Nov 2020 23:15:32 +0000 (23:15 +0000)]
Merge "rusty-gd: switch added services based on module under test" am: 71a9cf700d am: 892af2c353

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

Change-Id: I5515c12dd3314a9fe376087dfac72e0f58290b7e

3 years agoMerge "Simplify HAL protos" am: 7587b305c9 am: 00b06e3bd8
Zach Johnson [Mon, 16 Nov 2020 23:12:12 +0000 (23:12 +0000)]
Merge "Simplify HAL protos" am: 7587b305c9 am: 00b06e3bd8

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

Change-Id: Ib92cc8c378e27714981dc6f7b33dc7c73640d697

3 years agobtaa: do not initialize btaa module if init flag set to false
Michael Sun [Mon, 16 Nov 2020 22:24:18 +0000 (22:24 +0000)]
btaa: do not initialize btaa module if init flag set to false

Tag: #feature
Bug: 173435736
Test: m, verified BTAA not get initialized
Change-Id: I6b4195df5c908e5d7ccd7d27424c6bda7d7e5a36

3 years agoMerge "SecurityManager: Add CreateBondOutOfBand interface." am: 0c4fb72a70
Treehugger Robot [Mon, 16 Nov 2020 22:07:35 +0000 (22:07 +0000)]
Merge "SecurityManager: Add CreateBondOutOfBand interface." am: 0c4fb72a70

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

Change-Id: I31569cc1c325e7cea4f073c0a14317c89b4ca597

3 years agobtaa: null check btaa instance when receiving callback from SystemSuspend
Michael Sun [Mon, 16 Nov 2020 21:53:12 +0000 (21:53 +0000)]
btaa: null check btaa instance when receiving callback from SystemSuspend

Perform null pointer check upon receive callbacks from SystemSuspend
to mitigation the exception caused crash.

Tag: #feature
Bug: 173435736
Test: m
Change-Id: Ie15d179ebce82fdd91f32b3d8a98bb9bf8c66e84

3 years agoMerge "SecurityManager: Add CreateBondOutOfBand interface."
Treehugger Robot [Mon, 16 Nov 2020 21:52:21 +0000 (21:52 +0000)]
Merge "SecurityManager: Add CreateBondOutOfBand interface."

3 years agoMerge "GD Security OobData" am: 59d606e5fd
Treehugger Robot [Mon, 16 Nov 2020 21:30:40 +0000 (21:30 +0000)]
Merge "GD Security OobData" am: 59d606e5fd

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

Change-Id: I9c3a96e06ca9f5c2e4eaa10c052a6548bc7e9020

3 years agoMerge changes I4386b836,I27e6b6ce,I84842b13 am: 5c2f0c233c
Treehugger Robot [Mon, 16 Nov 2020 21:30:32 +0000 (21:30 +0000)]
Merge changes I4386b836,I27e6b6ce,I84842b13 am: 5c2f0c233c

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

Change-Id: I342b15190100bea707999a1fffb87a8d4170275b

3 years agoMerge changes I53b512b1,I1be0028c,Iabd6b355,I7d3ccb15 am: 4179e0131a
Myles Watson [Mon, 16 Nov 2020 21:30:11 +0000 (21:30 +0000)]
Merge changes I53b512b1,I1be0028c,Iabd6b355,I7d3ccb15 am: 4179e0131a

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

Change-Id: I7ce4415e8699ec5b8279c1facc864a572a89fb23

3 years agoMerge "rusty-gd: switch added services based on module under test" am: 71a9cf700d
Zach Johnson [Mon, 16 Nov 2020 21:29:03 +0000 (21:29 +0000)]
Merge "rusty-gd: switch added services based on module under test" am: 71a9cf700d

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

Change-Id: I63eac6fdeca2ff7f580f47da1760ea5506a20c98

3 years agoMerge "GD Security OobData"
Treehugger Robot [Mon, 16 Nov 2020 21:28:49 +0000 (21:28 +0000)]
Merge "GD Security OobData"

3 years agoMerge "Simplify HAL protos" am: 7587b305c9
Zach Johnson [Mon, 16 Nov 2020 21:23:44 +0000 (21:23 +0000)]
Merge "Simplify HAL protos" am: 7587b305c9

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

Change-Id: I82641d4b8ea06c00d3b270c4d94c256b3d8a9168

3 years agoMerge changes I4386b836,I27e6b6ce,I84842b13
Treehugger Robot [Mon, 16 Nov 2020 20:30:58 +0000 (20:30 +0000)]
Merge changes I4386b836,I27e6b6ce,I84842b13

* changes:
  GD Security Facade
  CertSecurity: Add accept_oob_pairing function
  Cert SecurityTest: Create branching conditional for multi test run

3 years agoMerge changes I53b512b1,I1be0028c,Iabd6b355,I7d3ccb15
Myles Watson [Mon, 16 Nov 2020 20:27:23 +0000 (20:27 +0000)]
Merge changes I53b512b1,I1be0028c,Iabd6b355,I7d3ccb15

* changes:
  CertSecurity: Add OOB related interfaces
  PySecurity: Add enable_secure_connections interface
  HciCaptures: Add OOB Related captures
  HciMatchers: Add OOB Related events.

3 years agoMerge "rusty-gd: switch added services based on module under test"
Zach Johnson [Mon, 16 Nov 2020 20:22:59 +0000 (20:22 +0000)]
Merge "rusty-gd: switch added services based on module under test"

3 years agoSecurityManager: Add CreateBondOutOfBand interface.
Martin Brabham [Mon, 16 Nov 2020 18:45:25 +0000 (10:45 -0800)]
SecurityManager: Add CreateBondOutOfBand interface.

Allow for creating bonds with remote Out of Band data.

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

3 years agoGD Security OobData
Martin Brabham [Mon, 16 Nov 2020 18:39:50 +0000 (10:39 -0800)]
GD Security OobData

Create an object to represent OobData in the Security Module.

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

3 years agoGD Security Facade
Martin Brabham [Fri, 13 Nov 2020 03:38:40 +0000 (19:38 -0800)]
GD Security Facade

Add CreateBondOutOfBand and OobDataBondMessage

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

3 years agorusty-gd: switch added services based on module under test
Zach Johnson [Wed, 11 Nov 2020 21:54:16 +0000 (13:54 -0800)]
rusty-gd: switch added services based on module under test

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I4c5ea7aa7273b77c95bcc9b8e21d286b35e67d10

3 years agoCertSecurity: Add OOB related interfaces
Martin Brabham [Fri, 13 Nov 2020 23:06:55 +0000 (15:06 -0800)]
CertSecurity: Add OOB related interfaces

 - set_remote_oob_data
 - get_oob_data_from_controller
 - enable_secure_connections

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

3 years agoCertSecurity: Add accept_oob_pairing function
Martin Brabham [Sat, 14 Nov 2020 00:06:35 +0000 (16:06 -0800)]
CertSecurity: Add accept_oob_pairing function

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

3 years agoPySecurity: Add enable_secure_connections interface
Martin Brabham [Fri, 13 Nov 2020 21:59:46 +0000 (13:59 -0800)]
PySecurity: Add enable_secure_connections interface

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

3 years agoCert SecurityTest: Create branching conditional for multi test run
Martin Brabham [Fri, 13 Nov 2020 23:47:13 +0000 (15:47 -0800)]
Cert SecurityTest: Create branching conditional for multi test run

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

3 years agoHciCaptures: Add OOB Related captures
Martin Brabham [Fri, 13 Nov 2020 00:40:07 +0000 (16:40 -0800)]
HciCaptures: Add OOB Related captures

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

3 years agoHciMatchers: Add OOB Related events.
Martin Brabham [Fri, 13 Nov 2020 00:39:16 +0000 (16:39 -0800)]
HciMatchers: Add OOB Related events.

Additionally, add a useful Logger function that assisted with
solving the problem.

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

3 years agoMerge "Simplify HAL protos"
Zach Johnson [Mon, 16 Nov 2020 18:06:56 +0000 (18:06 +0000)]
Merge "Simplify HAL protos"

3 years agoshim: check subevent for advertising module
Chienyuan [Mon, 16 Nov 2020 08:47:58 +0000 (16:47 +0800)]
shim: check subevent for advertising module

Tag: #refactor
Bug: 169125803
Test: cert/run --host
Test: atest --host bluetooth_test_gd
Change-Id: I17ea246feadfebc83757e55bb6238db458bf52d4

3 years agoMerge "Disable sniff for faulty remotes" am: 34140a7d4c am: 410368c94a
Treehugger Robot [Mon, 16 Nov 2020 02:17:38 +0000 (02:17 +0000)]
Merge "Disable sniff for faulty remotes" am: 34140a7d4c am: 410368c94a

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

Change-Id: I9f4869ef24037f1663b75250317b63e75176465e

3 years agoMerge "Disable sniff for faulty remotes" am: 34140a7d4c
Treehugger Robot [Mon, 16 Nov 2020 02:02:53 +0000 (02:02 +0000)]
Merge "Disable sniff for faulty remotes" am: 34140a7d4c

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

Change-Id: I43c037e3e81a9fa54fe032e6d79a5ad6eb218f47

3 years agoMerge "Disable sniff for faulty remotes"
Treehugger Robot [Mon, 16 Nov 2020 01:54:17 +0000 (01:54 +0000)]
Merge "Disable sniff for faulty remotes"

3 years agoCanonicalization of tGATT_CBACK gap and gatt am: 4692b7f16f am: 30d77a6681
Chris Manton [Sat, 14 Nov 2020 18:09:41 +0000 (18:09 +0000)]
Canonicalization of tGATT_CBACK gap and gatt am: 4692b7f16f am: 30d77a6681

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

Change-Id: If1f6f48167b27c93cf4d084a5994dbe62bf19a66

3 years agoCanonicalization of tGATT_CBACK gap and gatt am: 4692b7f16f
Chris Manton [Sat, 14 Nov 2020 17:56:41 +0000 (17:56 +0000)]
Canonicalization of tGATT_CBACK gap and gatt am: 4692b7f16f

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

Change-Id: I1156c92f8aa7280b47e88cce682788fe9a05ad4f

3 years agoCanonicalization of tGATT_CBACK gap and gatt
Chris Manton [Thu, 12 Nov 2020 18:41:01 +0000 (10:41 -0800)]
Canonicalization of tGATT_CBACK gap and gatt

Towards readable code

Bug: 163134718
Tag: #refactor
Test: CtsVerifier

Change-Id: I34092cd3c8776d649532a192e90190516d2ae09d

3 years agoMerge "Fix for Multiplication overflow will be crash btstack" am: 47afa6d49d am:...
Treehugger Robot [Sat, 14 Nov 2020 00:26:01 +0000 (00:26 +0000)]
Merge "Fix for Multiplication overflow will be crash btstack" am: 47afa6d49d am: 524c3db482

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

Change-Id: I4d33512ab4b0f9173275d94bc8dc376367118ea5

3 years agoMerge "Fix for Multiplication overflow will be crash btstack" am: 47afa6d49d
Treehugger Robot [Sat, 14 Nov 2020 00:18:07 +0000 (00:18 +0000)]
Merge "Fix for Multiplication overflow will be crash btstack" am: 47afa6d49d

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

Change-Id: Ie9b3119f99e6f08aa92a1f0ed5e0cc001cb3dc82

3 years agoMerge "Fix for Multiplication overflow will be crash btstack"
Treehugger Robot [Sat, 14 Nov 2020 00:07:38 +0000 (00:07 +0000)]
Merge "Fix for Multiplication overflow will be crash btstack"

3 years agoMerge changes I014fe130,I2e0301e3 am: e968b9f734 am: d9d495c384
Zach Johnson [Fri, 13 Nov 2020 20:20:44 +0000 (20:20 +0000)]
Merge changes I014fe130,I2e0301e3 am: e968b9f734 am: d9d495c384

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

Change-Id: I31a4792cb3e04b8c9f8fae59c1447afb4379d6b1

3 years agoMerge changes I014fe130,I2e0301e3 am: e968b9f734
Zach Johnson [Fri, 13 Nov 2020 20:05:57 +0000 (20:05 +0000)]
Merge changes I014fe130,I2e0301e3 am: e968b9f734

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

Change-Id: If94f367108a263f011f448fd739058442e7a1b0c

3 years agoMerge changes I014fe130,I2e0301e3
Zach Johnson [Fri, 13 Nov 2020 19:41:21 +0000 (19:41 +0000)]
Merge changes I014fe130,I2e0301e3

* changes:
  rusty-gd: convert hci facade to rust_grpcio build targets
  rusty-gd: add stubs for hci hal facade

3 years agoFix for Multiplication overflow will be crash btstack
cnx421 [Fri, 6 Nov 2020 07:35:04 +0000 (15:35 +0800)]
Fix for Multiplication overflow will be crash btstack

When a2dp using LDAC ecoding PCM,if encoding thread is runned by deley after 2 secends,
btstack will overflow .System will abort to crash by arm gcc code.

Bug: 172590955
Tag: #stability
Test: compile & verify basic functions working
Test: pair to a support LDAC ecode BT headset

Change-Id: Ie470bd51bfd7951d0c674b37aa6af7554cf9faa8

3 years agoMerge "gd: Use ExtendedAdvertising as main advertising function" am: 5bcc243ccc am...
Treehugger Robot [Fri, 13 Nov 2020 08:07:36 +0000 (08:07 +0000)]
Merge "gd: Use ExtendedAdvertising as main advertising function" am: 5bcc243ccc am: 36edf88ff4

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

Change-Id: I487072479e16cf6ef734602b880ff5630230331f

3 years agoMerge "gd: Use ExtendedAdvertising as main advertising function" am: 5bcc243ccc
Treehugger Robot [Fri, 13 Nov 2020 07:42:00 +0000 (07:42 +0000)]
Merge "gd: Use ExtendedAdvertising as main advertising function" am: 5bcc243ccc

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

Change-Id: I7486b2970034d1a00d97d30bb1b016bf8bc9038a

3 years agoMerge "gd: Use ExtendedAdvertising as main advertising function"
Treehugger Robot [Fri, 13 Nov 2020 06:42:38 +0000 (06:42 +0000)]
Merge "gd: Use ExtendedAdvertising as main advertising function"

3 years agoMerge changes Ida69a204,Iad4dbf36,I6749a539,Iab3b9763 am: cdc11ddccb am: ae366d6be3
Michael Sun [Thu, 12 Nov 2020 21:27:00 +0000 (21:27 +0000)]
Merge changes Ida69a204,Iad4dbf36,I6749a539,Iab3b9763 am: cdc11ddccb am: ae366d6be3

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

Change-Id: Ie1ec44646877a5bd78493441484acbad69a71060

3 years agoMerge changes Ida69a204,Iad4dbf36,I6749a539,Iab3b9763 am: cdc11ddccb
Michael Sun [Thu, 12 Nov 2020 21:05:36 +0000 (21:05 +0000)]
Merge changes Ida69a204,Iad4dbf36,I6749a539,Iab3b9763 am: cdc11ddccb

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

Change-Id: Id94ff56221630d26f31d9a91cecf1d3096fd2464

3 years agoMerge changes Ida69a204,Iad4dbf36,I6749a539,Iab3b9763
Michael Sun [Thu, 12 Nov 2020 20:35:32 +0000 (20:35 +0000)]
Merge changes Ida69a204,Iad4dbf36,I6749a539,Iab3b9763

* changes:
  btaa: subscribe to bt_snoop to receive HCI data
  btaa: subscribe to SystemSuspend for wakelock notification
  btaa: subscribe to SystemSuspend for wakeup notification
  btaa: introduce Bluetooth Activity Attribution skeleton

3 years agol2cap: Allow services without config indicator cb to register am: 6c319f3219 am:...
Chris Manton [Thu, 12 Nov 2020 19:42:21 +0000 (19:42 +0000)]
l2cap: Allow services without config indicator cb to register am: 6c319f3219 am: 1c0269b580

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

Change-Id: Ia6720c85d3d4c108ce34255067f6477ec7e44e88

3 years agoRe-log stack/l2cap/l2c_api::L2CA_DisconnectReq am: 8cd1cfabdc am: 5e5b61d8fb
Chris Manton [Thu, 12 Nov 2020 19:42:20 +0000 (19:42 +0000)]
Re-log stack/l2cap/l2c_api::L2CA_DisconnectReq am: 8cd1cfabdc am: 5e5b61d8fb

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

Change-Id: I881af98b6974b210c199e508fc55a820a3def2bc

3 years agoRe-log stack/acl/btm_acl::acl_disconnect_after_role_switch am: f2c7cecacb am: 0601e030d7
Chris Manton [Thu, 12 Nov 2020 19:42:20 +0000 (19:42 +0000)]
Re-log stack/acl/btm_acl::acl_disconnect_after_role_switch am: f2c7cecacb am: 0601e030d7

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

Change-Id: Iaa617de53fac81e9a73a27654a0777b91feb0673

3 years agoRe-log stack/gatt/gatt_cl::gatt_process_prep_write_rsp am: 37fc5e5af3 am: 1959fa55bb
Chris Manton [Thu, 12 Nov 2020 19:42:19 +0000 (19:42 +0000)]
Re-log stack/gatt/gatt_cl::gatt_process_prep_write_rsp am: 37fc5e5af3 am: 1959fa55bb

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

Change-Id: Ic9c2ec7f48e26d8be2c6e5b6f3a7a8c178d95135

3 years agoStat-ify btif/src/btif_gatt_client am: 511ae6ed01 am: ec7bbcdcf6
Chris Manton [Thu, 12 Nov 2020 19:42:18 +0000 (19:42 +0000)]
Stat-ify btif/src/btif_gatt_client am: 511ae6ed01 am: ec7bbcdcf6

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

Change-Id: I743248a1fea5304253ea10370f8a16322d7d3ae7

3 years agoAdd btif/src/btif_gatt_client::bta_gattc_event_text am: 34aaeba697 am: 6d34724189
Chris Manton [Thu, 12 Nov 2020 19:42:16 +0000 (19:42 +0000)]
Add btif/src/btif_gatt_client::bta_gattc_event_text am: 34aaeba697 am: 6d34724189

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

Change-Id: I76ad3da33d69f99005e12f072fa69eb0975c980d