OSDN Git Service

android-x86/system-bt.git
4 years agoReset fixed channel after callback called am: 85d3201c96 am: 0dde857315
Automerger Merge Worker [Wed, 5 Feb 2020 21:32:55 +0000 (21:32 +0000)]
Reset fixed channel after callback called am: 85d3201c96 am: 0dde857315

Change-Id: I6b33ec3f85b00c20b36ef636ef3dfd94d67bdefe

4 years agoReset fixed channel after callback called am: 85d3201c96
Automerger Merge Worker [Wed, 5 Feb 2020 21:23:33 +0000 (21:23 +0000)]
Reset fixed channel after callback called am: 85d3201c96

Change-Id: Ide2bebd5dd2b21729583c554b3a0e0ccbb7329dc

4 years agoReset fixed channel after callback called
Chris Manton [Wed, 5 Feb 2020 16:57:41 +0000 (08:57 -0800)]
Reset fixed channel after callback called

Bug: 139137147
Test: Verify no ASSERT when remote closes channel

Change-Id: Iecd2f267c89a85444ce08d332f933a292085ce7f

4 years agoMerge "DeviceCert: Temporarily remove failing test suites" am: 94735e4d0d am: 88bf808dfd
Automerger Merge Worker [Wed, 5 Feb 2020 07:42:35 +0000 (07:42 +0000)]
Merge "DeviceCert: Temporarily remove failing test suites" am: 94735e4d0d am: 88bf808dfd

Change-Id: I2de6ea99696d6a9a67b903ecf457a582727d3d35

4 years agoMerge "DeviceCert: Temporarily remove failing test suites" am: 94735e4d0d
Automerger Merge Worker [Wed, 5 Feb 2020 07:33:26 +0000 (07:33 +0000)]
Merge "DeviceCert: Temporarily remove failing test suites" am: 94735e4d0d

Change-Id: I2fd1e52dcfbdab843929578ec999adb34e97a0cd

4 years agoMerge "DeviceCert: Temporarily remove failing test suites"
Treehugger Robot [Wed, 5 Feb 2020 07:22:28 +0000 (07:22 +0000)]
Merge "DeviceCert: Temporarily remove failing test suites"

4 years agoDeviceCert: Temporarily remove failing test suites
Hansong Zhang [Wed, 5 Feb 2020 04:33:31 +0000 (20:33 -0800)]
DeviceCert: Temporarily remove failing test suites

Move them to cert/cert_testcases_facade_only_all.
cert/cert_testcases_facade_only contains only passing tests. This allows
us to run all tests on server.

Test: cert/run_device_cert.sh
Bug: 148147248
Change-Id: I4ba00acad397c143180842a688f97b407f870c94

4 years agoMerge "Fix L2CAP exceed max transmit for both I-frame and S-frame under ERTM" am...
Automerger Merge Worker [Wed, 5 Feb 2020 03:45:01 +0000 (03:45 +0000)]
Merge "Fix L2CAP exceed max transmit for both I-frame and S-frame under ERTM" am: 83bcdaa526 am: ff5b092cde

Change-Id: Ie96be433b54d29ca3abf1517a1007c4a3f0f2302

4 years agoMerge "Fix L2CAP exceed max transmit for both I-frame and S-frame under ERTM" am...
Automerger Merge Worker [Wed, 5 Feb 2020 03:30:15 +0000 (03:30 +0000)]
Merge "Fix L2CAP exceed max transmit for both I-frame and S-frame under ERTM" am: 83bcdaa526

Change-Id: I5ac7413c3b8b43c8710c0f6456be0b42e38c393c

4 years agoMerge "Fix L2CAP exceed max transmit for both I-frame and S-frame under ERTM"
Treehugger Robot [Wed, 5 Feb 2020 03:19:17 +0000 (03:19 +0000)]
Merge "Fix L2CAP exceed max transmit for both I-frame and S-frame under ERTM"

4 years agoMerge "L2CAP: Add call to version info" am: c45635ac7e am: 9bc1189bf7
Automerger Merge Worker [Wed, 5 Feb 2020 00:59:26 +0000 (00:59 +0000)]
Merge "L2CAP: Add call to version info" am: c45635ac7e am: 9bc1189bf7

Change-Id: I30e6178bcfb12bafd4ddaa250473a80a7829c266

4 years agoMerge changes I3f560575,Ie0d423a9 am: 966a69cf09 am: 78aab4e2f1
Automerger Merge Worker [Wed, 5 Feb 2020 00:59:20 +0000 (00:59 +0000)]
Merge changes I3f560575,Ie0d423a9 am: 966a69cf09 am: 78aab4e2f1

Change-Id: Ia27aae46a2469d92bc768e027a021454fe0c3a2c

4 years agoMerge "L2CAP: Add call to version info" am: c45635ac7e
Automerger Merge Worker [Wed, 5 Feb 2020 00:46:29 +0000 (00:46 +0000)]
Merge "L2CAP: Add call to version info" am: c45635ac7e

Change-Id: Ia0eaf21c742863d26c5958af2893c8f43d5940e5

4 years agoMerge changes I3f560575,Ie0d423a9 am: 966a69cf09
Automerger Merge Worker [Wed, 5 Feb 2020 00:46:05 +0000 (00:46 +0000)]
Merge changes I3f560575,Ie0d423a9 am: 966a69cf09

Change-Id: Iecaf8419ad4a00ba19bcf8712cc052cb3d55d1ca

4 years agoMerge "L2CAP: Add call to version info"
Treehugger Robot [Wed, 5 Feb 2020 00:30:06 +0000 (00:30 +0000)]
Merge "L2CAP: Add call to version info"

4 years agoMerge changes I3f560575,Ie0d423a9
Treehugger Robot [Wed, 5 Feb 2020 00:25:56 +0000 (00:25 +0000)]
Merge changes I3f560575,Ie0d423a9

* changes:
  Neighbor: Test remote name
  RootCanal: Use a copied vector for SetName

4 years agoMerge "LegacyStorage: Fix logic to be more robust" am: 1cbd4c7d9a am: 0c20722570
Automerger Merge Worker [Tue, 4 Feb 2020 22:22:35 +0000 (22:22 +0000)]
Merge "LegacyStorage: Fix logic to be more robust" am: 1cbd4c7d9a am: 0c20722570

Change-Id: I40fd0c459daaa698250bfc767f630a40a7241145

4 years agoAdd cert/android_devices_config.json to dist am: 0339a556c7 am: d3a093eb13
Automerger Merge Worker [Tue, 4 Feb 2020 22:22:30 +0000 (22:22 +0000)]
Add cert/android_devices_config.json to dist am: 0339a556c7 am: d3a093eb13

Change-Id: Ifaa57782780ac52df822eeddd23dbe8b1cc21fa0

4 years agoMerge "LegacyStorage: Fix logic to be more robust" am: 1cbd4c7d9a
Automerger Merge Worker [Tue, 4 Feb 2020 22:13:12 +0000 (22:13 +0000)]
Merge "LegacyStorage: Fix logic to be more robust" am: 1cbd4c7d9a

Change-Id: I587f83030b180d2b82ea352a919c31c42b040629

4 years agoAdd cert/android_devices_config.json to dist am: 0339a556c7
Automerger Merge Worker [Tue, 4 Feb 2020 22:13:00 +0000 (22:13 +0000)]
Add cert/android_devices_config.json to dist am: 0339a556c7

Change-Id: I6c343c2c4e8e84ab058ef83e7103f53be05fb00d

4 years agoMerge "LegacyStorage: Fix logic to be more robust"
Treehugger Robot [Tue, 4 Feb 2020 21:59:01 +0000 (21:59 +0000)]
Merge "LegacyStorage: Fix logic to be more robust"

4 years agoDeviceCert: Fix AclManagerTest am: 85315633d3 am: 422dadc7c0
Automerger Merge Worker [Tue, 4 Feb 2020 21:19:14 +0000 (21:19 +0000)]
DeviceCert: Fix AclManagerTest am: 85315633d3 am: 422dadc7c0

Change-Id: Ic0514ee487790b14adbb4abf2c87fb0090b606c3

4 years agoDeviceCert: Fix AclManagerTest am: 85315633d3
Automerger Merge Worker [Tue, 4 Feb 2020 21:06:59 +0000 (21:06 +0000)]
DeviceCert: Fix AclManagerTest am: 85315633d3

Change-Id: Iaa2c14184ad02d62a4d975e5ef4b5f56864f998b

4 years agoNeighbor: Test remote name
Myles Watson [Tue, 4 Feb 2020 14:26:21 +0000 (06:26 -0800)]
Neighbor: Test remote name

Bug: 145638034
Test: ./cert/run_cert_facade_only.sh
Change-Id: I3f56057573d2646ce44ed2a57019fef97a1e392b

4 years agoRootCanal: Use a copied vector for SetName
Myles Watson [Tue, 4 Feb 2020 20:14:20 +0000 (12:14 -0800)]
RootCanal: Use a copied vector for SetName

Bug: 145638034
Test: ./cert/run_cert_facade_only.sh
Change-Id: Ie0d423a9fa7a8d41d1fa87820d7b83c86f84d536

4 years agoDevice cert: set up device in test script am: fe94ef0d3f am: 09ed362cce
Automerger Merge Worker [Tue, 4 Feb 2020 20:20:44 +0000 (20:20 +0000)]
Device cert: set up device in test script am: fe94ef0d3f am: 09ed362cce

Change-Id: I74467a1392de18d7fd38f58ca826a584d2ca07c4

4 years agoDevice cert: set up device in test script am: fe94ef0d3f
Automerger Merge Worker [Tue, 4 Feb 2020 20:10:03 +0000 (20:10 +0000)]
Device cert: set up device in test script am: fe94ef0d3f

Change-Id: Ic3689a971cdac1b803711d8159c83369f0c05cad

4 years agoAdd cert/android_devices_config.json to dist
Hansong Zhang [Tue, 4 Feb 2020 19:37:06 +0000 (11:37 -0800)]
Add cert/android_devices_config.json to dist

Test: m dist bluetooth_stack_with_facade
Change-Id: I7fd8e14006e7d92401aaa548322aeb43767d7894

4 years agoDeviceCert: Fix AclManagerTest
Hansong Zhang [Tue, 4 Feb 2020 19:15:40 +0000 (11:15 -0800)]
DeviceCert: Fix AclManagerTest

Test: cert/run_device_cert.sh
Change-Id: I79348c8227bce6697166923e1a47df3101019c64

4 years agoDevice cert: set up device in test script
Hansong Zhang [Tue, 4 Feb 2020 18:16:15 +0000 (10:16 -0800)]
Device cert: set up device in test script

Currently users have to set up the device with adb shell commands
manually. Move it to test script instead.

Test: cert/run_cert_facade_only.sh and run_device_cert.sh
Bug: 148147248
Change-Id: Id475bd550a46e8cd11ade0b72a5cb4032f55980e

4 years agoMerge "HCI: Modify SimplePairingDebugMode base class" am: c1b0b5b071 am: 44797ba12d
Automerger Merge Worker [Tue, 4 Feb 2020 19:18:46 +0000 (19:18 +0000)]
Merge "HCI: Modify SimplePairingDebugMode base class" am: c1b0b5b071 am: 44797ba12d

Change-Id: I79dce0bcf22e0951fe175e83bfd49bf450b32de3

4 years agoMerge "ACL: Add functions for remote version information" am: e7795be468 am: 61728b5c59
Automerger Merge Worker [Tue, 4 Feb 2020 19:18:42 +0000 (19:18 +0000)]
Merge "ACL: Add functions for remote version information" am: e7795be468 am: 61728b5c59

Change-Id: I670d77b02a8cfe85045900134d4c945da4c9004b

4 years agoMerge "HCI: Modify SimplePairingDebugMode base class" am: c1b0b5b071
Automerger Merge Worker [Tue, 4 Feb 2020 19:07:07 +0000 (19:07 +0000)]
Merge "HCI: Modify SimplePairingDebugMode base class" am: c1b0b5b071

Change-Id: I3a1f5404adbffa3eb15ccb0dca48c2883518e8ea

4 years agoMerge "ACL: Add functions for remote version information" am: e7795be468
Automerger Merge Worker [Tue, 4 Feb 2020 19:06:57 +0000 (19:06 +0000)]
Merge "ACL: Add functions for remote version information" am: e7795be468

Change-Id: I4c38cedd316e40a76d157e8dcabc8fb59b794491

4 years agoMerge "HCI: Modify SimplePairingDebugMode base class"
Treehugger Robot [Tue, 4 Feb 2020 19:02:31 +0000 (19:02 +0000)]
Merge "HCI: Modify SimplePairingDebugMode base class"

4 years agoLegacyStorage: Fix logic to be more robust
Martin Brabham [Tue, 4 Feb 2020 18:58:58 +0000 (10:58 -0800)]
LegacyStorage: Fix logic to be more robust

config_new(filename) will return nullptr if the filename
points to a non-existing file.  Additionally, if the config
doesn't have an Adapter section it is considered useless
by legacy stack, so copy that logic here too.

Bug: 144376599
Test: manual
Change-Id: I6ceb49f4fa49fb220a40cd3c502f63775859299c

4 years agoMerge "DirectHciTest: Always listen to CONNECTION_PACKET_TYPE_CHANGED" am: 1112316b1f...
Automerger Merge Worker [Tue, 4 Feb 2020 18:52:01 +0000 (18:52 +0000)]
Merge "DirectHciTest: Always listen to CONNECTION_PACKET_TYPE_CHANGED" am: 1112316b1f am: f0bff8ea27

Change-Id: I46e43b66a56db379653706e12b0b6b3b0f671035

4 years agoMerge "ACL: Add functions for remote version information"
Treehugger Robot [Tue, 4 Feb 2020 18:51:42 +0000 (18:51 +0000)]
Merge "ACL: Add functions for remote version information"

4 years agoMerge "DirectHciTest: Always listen to CONNECTION_PACKET_TYPE_CHANGED" am: 1112316b1f
Automerger Merge Worker [Tue, 4 Feb 2020 18:42:14 +0000 (18:42 +0000)]
Merge "DirectHciTest: Always listen to CONNECTION_PACKET_TYPE_CHANGED" am: 1112316b1f

Change-Id: I08a0599352d780356d532eba006b2def23ea4027

4 years agoMerge "DirectHciTest: Always listen to CONNECTION_PACKET_TYPE_CHANGED"
Treehugger Robot [Tue, 4 Feb 2020 18:31:11 +0000 (18:31 +0000)]
Merge "DirectHciTest: Always listen to CONNECTION_PACKET_TYPE_CHANGED"

4 years agoL2CAP: Add call to version info
Martin Brabham [Tue, 4 Feb 2020 17:44:53 +0000 (09:44 -0800)]
L2CAP: Add call to version info

Additionally add get remote offset call, as I see this happen
in normal snoop logs before the pairing happens, and some
cleanup/code consolidation.

Bug: 145638034
Test: bluetooth_test_gd
Change-Id: I59ff22452025d92631dce7926e94291c0b9df3d1

4 years agoACL: Add functions for remote version information
Martin Brabham [Tue, 4 Feb 2020 17:33:53 +0000 (09:33 -0800)]
ACL: Add functions for remote version information

Bug: 145638034
Test: bluetooth_test_gd
Change-Id: Ib2458e10737b244123bed14b3c5c96685505e9eb

4 years agoHCI: Add features notification to security i/f am: 3fa8a2aca4 am: da4adec39e
Automerger Merge Worker [Tue, 4 Feb 2020 17:40:52 +0000 (17:40 +0000)]
HCI: Add features notification to security i/f am: 3fa8a2aca4 am: da4adec39e

Change-Id: Ib43883572a0ddb06079a217eb5a6671047201a50

4 years agoRootCanal: Send SimplePairingComplete on success am: 9fe5fe2731 am: d37288aa84
Automerger Merge Worker [Tue, 4 Feb 2020 17:40:49 +0000 (17:40 +0000)]
RootCanal: Send SimplePairingComplete on success am: 9fe5fe2731 am: d37288aa84

Change-Id: I5607b0ea47a663a71505a368a4f621c53fd39bf9

4 years agoHCI: Add features notification to security i/f am: 3fa8a2aca4
Automerger Merge Worker [Tue, 4 Feb 2020 17:29:20 +0000 (17:29 +0000)]
HCI: Add features notification to security i/f am: 3fa8a2aca4

Change-Id: I30bad4d3d206e15d24a9474bd4bad3bb5ac99a3b

4 years agoRootCanal: Send SimplePairingComplete on success am: 9fe5fe2731
Automerger Merge Worker [Tue, 4 Feb 2020 17:29:17 +0000 (17:29 +0000)]
RootCanal: Send SimplePairingComplete on success am: 9fe5fe2731

Change-Id: I29a2cd711b36e1c85fbbfe36524b988f2ac68091

4 years agoHCI: Modify SimplePairingDebugMode base class
Martin Brabham [Tue, 4 Feb 2020 17:26:22 +0000 (09:26 -0800)]
HCI: Modify SimplePairingDebugMode base class

Bug: 145638034
Test: manual; builds
Change-Id: Ia3f7ae0549f6e6e89bc924cea92c861c3da08439

4 years agoHCI: Add features notification to security i/f
Myles Watson [Tue, 4 Feb 2020 12:37:40 +0000 (04:37 -0800)]
HCI: Add features notification to security i/f

Bug: 145638034
Test: ./cert/run_cert_facade_only.sh
Change-Id: I91cde70c1c3b83fd9e7ba019367f8d112773d44d

4 years agoRootCanal: Send SimplePairingComplete on success
Myles Watson [Tue, 4 Feb 2020 12:38:15 +0000 (04:38 -0800)]
RootCanal: Send SimplePairingComplete on success

Send SimplePairingComplete after sending keys and before
authentication.

Bug: 145638034
Test: ./cert/run_cert_facade_only.sh
Change-Id: I9a262001b111c2caaae6c48413b2d836fdfaefae

4 years agoFix L2CAP exceed max transmit for both I-frame and S-frame under ERTM
Ted Wang [Thu, 30 Jan 2020 06:31:18 +0000 (14:31 +0800)]
Fix L2CAP exceed max transmit for both I-frame and S-frame under ERTM

* Under ERTM mode, ReqSeq of S-frame with R-bit set to RR is used to
  acknowledge previously received I-frames numbered up to and including
  ReqSeq - 1. So valid ReqSeq is start from 1.
* Stack should not retransmit I-frame once it exceed max transmittion
  and initiates closure of the L2CAP channel.
* Add following tests in simple_l2cap_test:
    test_i_frame_transmissions_exceed_max_transmit

Bug: 148771210
Test: run_cert.sh

Change-Id: Id1fb2fab8be7f7e05a09935002366e60df5f7b81

4 years agoMerge "Propagate connection failures to client" am: 4d8b3d2114 am: 6fd0f70d3f
Automerger Merge Worker [Tue, 4 Feb 2020 04:20:43 +0000 (04:20 +0000)]
Merge "Propagate connection failures to client" am: 4d8b3d2114 am: 6fd0f70d3f

Change-Id: Ib6f47b104478c4265a3a784af9aa38818e098077

4 years agoMerge "Propagate connection failures to client" am: 4d8b3d2114
Automerger Merge Worker [Tue, 4 Feb 2020 04:11:28 +0000 (04:11 +0000)]
Merge "Propagate connection failures to client" am: 4d8b3d2114

Change-Id: Id5995e906d70dec0d4ecba9b10e22188a9d2aa51

4 years agoMerge "Propagate connection failures to client"
Treehugger Robot [Tue, 4 Feb 2020 03:57:40 +0000 (03:57 +0000)]
Merge "Propagate connection failures to client"

4 years agoMerge "Add gd shim l2cap unit test" am: 1c5e7e608d am: 2199a4aad7
Automerger Merge Worker [Tue, 4 Feb 2020 03:51:21 +0000 (03:51 +0000)]
Merge "Add gd shim l2cap unit test" am: 1c5e7e608d am: 2199a4aad7

Change-Id: Ife491f3643f7b74fc10d295086beb895c8b9b319

4 years agoMerge "Add gd shim l2cap unit test" am: 1c5e7e608d
Automerger Merge Worker [Tue, 4 Feb 2020 03:44:45 +0000 (03:44 +0000)]
Merge "Add gd shim l2cap unit test" am: 1c5e7e608d

Change-Id: I72ed41e5281253fcf5e07c91810eab6e373508d7

4 years agoMerge "Add gd shim l2cap unit test"
Treehugger Robot [Tue, 4 Feb 2020 03:37:19 +0000 (03:37 +0000)]
Merge "Add gd shim l2cap unit test"

4 years agoMerge "Gracefully handle startup timer expiry" am: 311135570b am: fd888a082b
Automerger Merge Worker [Tue, 4 Feb 2020 03:05:03 +0000 (03:05 +0000)]
Merge "Gracefully handle startup timer expiry" am: 311135570b am: fd888a082b

Change-Id: Idd96828a87446ce485f80f357f4f7ccc51fee00a

4 years agoMerge "Gracefully handle startup timer expiry" am: 311135570b
Automerger Merge Worker [Tue, 4 Feb 2020 02:54:10 +0000 (02:54 +0000)]
Merge "Gracefully handle startup timer expiry" am: 311135570b

Change-Id: Ie2d58ed3956827fea882b18fe169290db9b4a9e0

4 years agoMerge "Gracefully handle startup timer expiry"
Treehugger Robot [Tue, 4 Feb 2020 02:43:49 +0000 (02:43 +0000)]
Merge "Gracefully handle startup timer expiry"

4 years agoAdd IsRpa and IsRpaThatMatchesIrk into AddressWithType am: 0d7044d048 am: 4b6eaead42
Automerger Merge Worker [Tue, 4 Feb 2020 01:52:47 +0000 (01:52 +0000)]
Add IsRpa and IsRpaThatMatchesIrk into AddressWithType am: 0d7044d048 am: 4b6eaead42

Change-Id: I77e229cfe06b3c770abaebbbbd8867735eb2761f

4 years agoAdd IsRpa and IsRpaThatMatchesIrk into AddressWithType am: 0d7044d048
Automerger Merge Worker [Tue, 4 Feb 2020 01:42:57 +0000 (01:42 +0000)]
Add IsRpa and IsRpaThatMatchesIrk into AddressWithType am: 0d7044d048

Change-Id: I2c77ab7c52a13368a9ac37b5383620adbd446856

4 years agoPropagate connection failures to client
Chris Manton [Fri, 31 Jan 2020 19:48:16 +0000 (11:48 -0800)]
Propagate connection failures to client

Bug: 146086425
Test: bluetooth_test_gd

Change-Id: I0efa1084ca89c3fc34ef117e7c9c6da2ef62c04b

4 years agoDirectHciTest: Always listen to CONNECTION_PACKET_TYPE_CHANGED
Hansong Zhang [Mon, 3 Feb 2020 23:20:41 +0000 (15:20 -0800)]
DirectHciTest: Always listen to CONNECTION_PACKET_TYPE_CHANGED

Test: run_cert_facade_only.sh
Change-Id: I70a0ce92c52358b532c90139f15f237b25a03796

4 years agoAdd IsRpa and IsRpaThatMatchesIrk into AddressWithType
Jakub Pawlowski [Mon, 3 Feb 2020 23:12:09 +0000 (00:12 +0100)]
Add IsRpa and IsRpaThatMatchesIrk into AddressWithType

Test: added unittests
Bug: 142341141
Change-Id: I0fc939317cf83793d2496780fab5ebdc05b76ba3

4 years agoAdd gd shim l2cap unit test
Chris Manton [Thu, 30 Jan 2020 01:10:14 +0000 (17:10 -0800)]
Add gd shim l2cap unit test

Bug: 141758481
Test: bluetooth_test_gd
Change-Id: I7ba26676a3e91f98f5d5d148422e51e737fc62f2

4 years agoMerge "SecurityManager::CreateBondLe" am: 56216d7e19 am: d038aaf99f
Automerger Merge Worker [Mon, 3 Feb 2020 21:32:19 +0000 (21:32 +0000)]
Merge "SecurityManager::CreateBondLe" am: 56216d7e19 am: d038aaf99f

Change-Id: Iecc243356160cd5b37ca495bb3d4c33c3893327f

4 years agoMerge "SecurityManager::CreateBondLe" am: 56216d7e19
Automerger Merge Worker [Mon, 3 Feb 2020 21:23:36 +0000 (21:23 +0000)]
Merge "SecurityManager::CreateBondLe" am: 56216d7e19

Change-Id: I4f42caab064b94909862e2643ac2a96b9e4690a9

4 years agoMerge "SecurityManager::CreateBondLe"
Treehugger Robot [Mon, 3 Feb 2020 21:09:09 +0000 (21:09 +0000)]
Merge "SecurityManager::CreateBondLe"

4 years agoSecurityManager::CreateBondLe
Jakub Pawlowski [Mon, 3 Feb 2020 17:42:00 +0000 (18:42 +0100)]
SecurityManager::CreateBondLe

This is stub to be implemented in the future. It is however wired to the
shim, and will get called when GD is running.

Bug: 142341141
Test: Attempt to bond with LE device, verify log is printed.
Change-Id: I7170ddb65fdd18af310ea180bb554439e884f3b7

4 years agoGracefully handle startup timer expiry
Ugo Yu [Mon, 3 Feb 2020 12:37:17 +0000 (20:37 +0800)]
Gracefully handle startup timer expiry

* Close HCI when startup timer has expired as a signal of error to
  the Bluetooth HAL.
* Do not handle H/W error event if the stack has already received
  root inflammtion event.
* Correctly handle initializeComplete callback after receives a root
  inflammation event.

Bug: 144572644
Test: Manual
Change-Id: Ic165ff1340bcada5d71668ac76e71ef67f2643fd

4 years agoMerge "Move EventAsserts close to with statements" am: cac6480bba am: 121ddb61a4
Automerger Merge Worker [Sun, 2 Feb 2020 02:49:05 +0000 (02:49 +0000)]
Merge "Move EventAsserts close to with statements" am: cac6480bba am: 121ddb61a4

Change-Id: I53f7981d23364c125f4da09e94a6f77cdcfb4aa3

4 years agoMerge "Move EventAsserts close to with statements" am: cac6480bba
Automerger Merge Worker [Sun, 2 Feb 2020 02:35:25 +0000 (02:35 +0000)]
Merge "Move EventAsserts close to with statements" am: cac6480bba

Change-Id: I7fe4218577d8729ac249b608d2ab5b2c13e49072

4 years agoMerge "Move EventAsserts close to with statements"
Treehugger Robot [Sun, 2 Feb 2020 02:21:24 +0000 (02:21 +0000)]
Merge "Move EventAsserts close to with statements"

4 years agoMerge "Add removeActiveDevice to IBluetooth.aidl" am: c68c3703c5 am: 2e95bacb2e
Automerger Merge Worker [Sat, 1 Feb 2020 23:47:57 +0000 (23:47 +0000)]
Merge "Add removeActiveDevice to IBluetooth.aidl" am: c68c3703c5 am: 2e95bacb2e

Change-Id: If4d2a25467c808430561cbaa99da6dca9037a24c

4 years agoMerge "Add removeActiveDevice to IBluetooth.aidl" am: c68c3703c5
Automerger Merge Worker [Sat, 1 Feb 2020 23:37:45 +0000 (23:37 +0000)]
Merge "Add removeActiveDevice to IBluetooth.aidl" am: c68c3703c5

Change-Id: I986e6e36b3a75a10ebf898862dffd454a6f7ebd7

4 years agoMerge "Add removeActiveDevice to IBluetooth.aidl"
Treehugger Robot [Sat, 1 Feb 2020 23:27:10 +0000 (23:27 +0000)]
Merge "Add removeActiveDevice to IBluetooth.aidl"

4 years agoMerge "gd: Fix reactor race condition" am: df081b70c4 am: 0d9f2f3c71
Automerger Merge Worker [Sat, 1 Feb 2020 07:31:37 +0000 (07:31 +0000)]
Merge "gd: Fix reactor race condition" am: df081b70c4 am: 0d9f2f3c71

Change-Id: I0892bb51b03c69644b54891dfff5ffa69063b548

4 years agoMerge "gd: Fix reactor race condition" am: df081b70c4
Automerger Merge Worker [Sat, 1 Feb 2020 07:16:52 +0000 (07:16 +0000)]
Merge "gd: Fix reactor race condition" am: df081b70c4

Change-Id: I36e6f4f500f23fe816a58785254bf005e0db0013

4 years agoMerge "gd: Fix reactor race condition"
Treehugger Robot [Sat, 1 Feb 2020 07:04:24 +0000 (07:04 +0000)]
Merge "gd: Fix reactor race condition"

4 years agogd: Fix reactor race condition
Chris Manton [Sat, 1 Feb 2020 02:38:36 +0000 (18:38 -0800)]
gd: Fix reactor race condition

If one thread is in Unregister() while another is
in Run(), there is a very small window where
the reactor lock drops allowing Unregister()
to think the reactable is not running, but it is.  So
then the reactable is deleted underneath the Run()
thread and crashy ensues.

Bug: 148703760
Test: bluetooth_test_gd --gtest_filter=L2capClassicLinkTest.* --gtest_repeat=1000000
Change-Id: I11535fdcda2102102e6e9e23baecd5465549c723

4 years agoMove EventAsserts close to with statements
Myles Watson [Thu, 30 Jan 2020 00:51:57 +0000 (16:51 -0800)]
Move EventAsserts close to with statements

Bug: 148096951
Test: ./cert/run_cert_facade_only.sh
Change-Id: Icb9c6d4b555f80ad434824695b76e5a03c36021d

4 years agoAdd missing .so to dist am: a7f57fd8e9 am: 29c9fabe74
Automerger Merge Worker [Fri, 31 Jan 2020 16:28:18 +0000 (16:28 +0000)]
Add missing .so to dist am: a7f57fd8e9 am: 29c9fabe74

Change-Id: I11ef1c59cb147a33f8f08a0ab37e7f6c458df92b

4 years agoMerge "LE Legacy Pairing fixes" am: 1b61d23aa2 am: 1243030dbf
Automerger Merge Worker [Fri, 31 Jan 2020 16:25:23 +0000 (16:25 +0000)]
Merge "LE Legacy Pairing fixes" am: 1b61d23aa2 am: 1243030dbf

Change-Id: Ia2f0616374dd3de613d6f10c1ef3e45f70f41057

4 years agoAdd missing .so to dist am: a7f57fd8e9
Automerger Merge Worker [Fri, 31 Jan 2020 16:13:25 +0000 (16:13 +0000)]
Add missing .so to dist am: a7f57fd8e9

Change-Id: I3b054ac1a45e4d4123ae66067e3eccca2b711ab6

4 years agoMerge "Add new function getMostRecentlyConnectedDevices to IBluetooth.aidl" am: ac88a...
Automerger Merge Worker [Fri, 31 Jan 2020 16:11:53 +0000 (16:11 +0000)]
Merge "Add new function getMostRecentlyConnectedDevices to IBluetooth.aidl" am: ac88ab624d am: 3340890d36

Change-Id: Ic5b8401505897b0025e406626570d0a56cb57e0c

4 years agoMerge "LE Legacy Pairing fixes" am: 1b61d23aa2
Automerger Merge Worker [Fri, 31 Jan 2020 16:11:22 +0000 (16:11 +0000)]
Merge "LE Legacy Pairing fixes" am: 1b61d23aa2

Change-Id: I122e2bc4effb8f6584e1161ab32506118562c22c

4 years agoMerge "Add new function getMostRecentlyConnectedDevices to IBluetooth.aidl" am: ac88a...
Automerger Merge Worker [Fri, 31 Jan 2020 16:10:50 +0000 (16:10 +0000)]
Merge "Add new function getMostRecentlyConnectedDevices to IBluetooth.aidl" am: ac88ab624d

Change-Id: I9bf5a296009d0de19f645a1576f80d6b7d98aad5

4 years agoAdd removeActiveDevice to IBluetooth.aidl
Rahul Sabnis [Fri, 31 Jan 2020 01:02:17 +0000 (17:02 -0800)]
Add removeActiveDevice to IBluetooth.aidl

Bug: 147428526
Test: Manual
Change-Id: I4f8e526d8f4924841f1d29aed101915ad6d97df0

4 years agoAdd missing .so to dist
Hansong Zhang [Thu, 30 Jan 2020 19:27:28 +0000 (11:27 -0800)]
Add missing .so to dist

Test: m dist bluetooth_stack_with_facade
Bug: 148147248
Change-Id: I504acb08d3ef6d415901bd9e42458116faae30ad

4 years agoLE Pairing Handler improvements and fixes am: 3bf5fdc25f am: cc31119828
Automerger Merge Worker [Thu, 30 Jan 2020 18:00:33 +0000 (18:00 +0000)]
LE Pairing Handler improvements and fixes am: 3bf5fdc25f am: cc31119828

Change-Id: I9a6b586b705759c82e8e9e600d3cd45b7dfb451d

4 years agoLE Pairing Handler improvements and fixes am: 3bf5fdc25f
Automerger Merge Worker [Thu, 30 Jan 2020 17:40:23 +0000 (17:40 +0000)]
LE Pairing Handler improvements and fixes am: 3bf5fdc25f

Change-Id: Iba0fd75acd3d2b025067bd943169e13e7091db33

4 years agoL2CAP socket: Stop L2CAP server by ID instead of PSM am: 7c901002dc
Automerger Merge Worker [Thu, 30 Jan 2020 02:26:44 +0000 (02:26 +0000)]
L2CAP socket: Stop L2CAP server by ID instead of PSM am: 7c901002dc

Change-Id: I5507eba0d17d53ff75c173bde1fab54ccd6babf6

4 years agoL2CAP Socket: Keep track of last allocated socket ID am: eb4e9162b9
Automerger Merge Worker [Thu, 30 Jan 2020 02:26:38 +0000 (02:26 +0000)]
L2CAP Socket: Keep track of last allocated socket ID am: eb4e9162b9

Change-Id: I09cb66c5e1e13bc8a3bc0c5f8447ee31a1d863eb

4 years agoMerge "LE Legacy Pairing fixes"
Treehugger Robot [Thu, 30 Jan 2020 02:19:01 +0000 (02:19 +0000)]
Merge "LE Legacy Pairing fixes"

4 years agoMerge "Add new function getMostRecentlyConnectedDevices to IBluetooth.aidl"
Treehugger Robot [Wed, 29 Jan 2020 23:44:36 +0000 (23:44 +0000)]
Merge "Add new function getMostRecentlyConnectedDevices to IBluetooth.aidl"

4 years agoLE Legacy Pairing fixes
Jakub Pawlowski [Wed, 29 Jan 2020 21:19:24 +0000 (22:19 +0100)]
LE Legacy Pairing fixes

This patch fixes issues found during tests against real devices

Test: Pair with android TV remote, security key
Bug: 142341141
Change-Id: I2fb15c97f4e60710fa986762576211e4048d5271

4 years agoAdd new function getMostRecentlyConnectedDevices to IBluetooth.aidl
Rahul Sabnis [Wed, 29 Jan 2020 19:57:39 +0000 (11:57 -0800)]
Add new function getMostRecentlyConnectedDevices to IBluetooth.aidl

Bug: 130984590
Test: Manual
Change-Id: I1a921ad1ba2d21c1f8ccd668ea01a5a59eb82e31

4 years agoLE Pairing Handler improvements and fixes
Jakub Pawlowski [Wed, 29 Jan 2020 11:50:56 +0000 (12:50 +0100)]
LE Pairing Handler improvements and fixes

* improve logging for easier debugging
* fix AuthReq bitmasks
* distribute proper keys in secure connections mode
* return on encryption change failures

Bug: 142341141
Test: manual testing against Pixel phone
Change-Id: I27106e05cae22f669e39eb961daeab7c0a065135

4 years agoShow warning on invalid data frame in Basic mode am: c54ed46e30 am: b1eded5545
Automerger Merge Worker [Wed, 29 Jan 2020 15:24:54 +0000 (15:24 +0000)]
Show warning on invalid data frame in Basic mode am: c54ed46e30 am: b1eded5545

Change-Id: Ia47f127117e99153c1161a3d929b39caced0d860

4 years agoShow warning on invalid data frame in Basic mode
Jakub Pawlowski [Wed, 29 Jan 2020 15:08:41 +0000 (07:08 -0800)]
Show warning on invalid data frame in Basic mode
am: c54ed46e30

Change-Id: I9235ec63464942179b29021132fab50f371decf2