OSDN Git Service
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
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
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
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
Treehugger Robot [Tue, 4 Feb 2020 21:59:01 +0000 (21:59 +0000)]
Merge "LegacyStorage: Fix logic to be more robust"
Automerger Merge Worker [Tue, 4 Feb 2020 21:19:14 +0000 (21:19 +0000)]
DeviceCert: Fix AclManagerTest am:
85315633d3 am:
422dadc7c0
Change-Id: Ic0514ee487790b14adbb4abf2c87fb0090b606c3
Automerger Merge Worker [Tue, 4 Feb 2020 21:06:59 +0000 (21:06 +0000)]
DeviceCert: Fix AclManagerTest am:
85315633d3
Change-Id: Iaa2c14184ad02d62a4d975e5ef4b5f56864f998b
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
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
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
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
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
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
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
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
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
Treehugger Robot [Tue, 4 Feb 2020 19:02:31 +0000 (19:02 +0000)]
Merge "HCI: Modify SimplePairingDebugMode base class"
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
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
Treehugger Robot [Tue, 4 Feb 2020 18:51:42 +0000 (18:51 +0000)]
Merge "ACL: Add functions for remote version information"
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
Treehugger Robot [Tue, 4 Feb 2020 18:31:11 +0000 (18:31 +0000)]
Merge "DirectHciTest: Always listen to CONNECTION_PACKET_TYPE_CHANGED"
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
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
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
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
Automerger Merge Worker [Tue, 4 Feb 2020 17:29:17 +0000 (17:29 +0000)]
RootCanal: Send SimplePairingComplete on success am:
9fe5fe2731
Change-Id: I29a2cd711b36e1c85fbbfe36524b988f2ac68091
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
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
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
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
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
Treehugger Robot [Tue, 4 Feb 2020 03:57:40 +0000 (03:57 +0000)]
Merge "Propagate connection failures to client"
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
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
Treehugger Robot [Tue, 4 Feb 2020 03:37:19 +0000 (03:37 +0000)]
Merge "Add gd shim l2cap unit test"
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
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
Treehugger Robot [Tue, 4 Feb 2020 02:43:49 +0000 (02:43 +0000)]
Merge "Gracefully handle startup timer expiry"
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
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
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
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
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
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
Automerger Merge Worker [Mon, 3 Feb 2020 21:32:19 +0000 (21:32 +0000)]
Merge "SecurityManager::CreateBondLe" am:
56216d7e19 am:
d038aaf99f
Change-Id: Iecc243356160cd5b37ca495bb3d4c33c3893327f
Automerger Merge Worker [Mon, 3 Feb 2020 21:23:36 +0000 (21:23 +0000)]
Merge "SecurityManager::CreateBondLe" am:
56216d7e19
Change-Id: I4f42caab064b94909862e2643ac2a96b9e4690a9
Treehugger Robot [Mon, 3 Feb 2020 21:09:09 +0000 (21:09 +0000)]
Merge "SecurityManager::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
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
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
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
Treehugger Robot [Sun, 2 Feb 2020 02:21:24 +0000 (02:21 +0000)]
Merge "Move EventAsserts close to with statements"
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
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
Treehugger Robot [Sat, 1 Feb 2020 23:27:10 +0000 (23:27 +0000)]
Merge "Add removeActiveDevice to IBluetooth.aidl"
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
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
Treehugger Robot [Sat, 1 Feb 2020 07:04:24 +0000 (07:04 +0000)]
Merge "gd: 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
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
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
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
Automerger Merge Worker [Fri, 31 Jan 2020 16:13:25 +0000 (16:13 +0000)]
Add missing .so to dist am:
a7f57fd8e9
Change-Id: I3b054ac1a45e4d4123ae66067e3eccca2b711ab6
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
Automerger Merge Worker [Fri, 31 Jan 2020 16:11:22 +0000 (16:11 +0000)]
Merge "LE Legacy Pairing fixes" am:
1b61d23aa2
Change-Id: I122e2bc4effb8f6584e1161ab32506118562c22c
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
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
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
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
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
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
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
Treehugger Robot [Thu, 30 Jan 2020 02:19:01 +0000 (02:19 +0000)]
Merge "LE Legacy Pairing fixes"
Treehugger Robot [Wed, 29 Jan 2020 23:44:36 +0000 (23:44 +0000)]
Merge "Add new function getMostRecentlyConnectedDevices to IBluetooth.aidl"
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
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
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
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
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
Jakub Pawlowski [Wed, 29 Jan 2020 12:58:15 +0000 (13:58 +0100)]
Show warning on invalid data frame in Basic mode
Change-Id: Ib8e81aa4ed82b6bae4371d6354c7a0f2d87fdcd1
Automerger Merge Worker [Wed, 29 Jan 2020 11:35:24 +0000 (11:35 +0000)]
Merge "Add ATT stub to prevent stack from crashing" am:
d2ffe59ae2 am:
df4e559ce1
Change-Id: Idf6e9aba3b8febf9a917ca80659dfc5aebd03318
Jakub Pawlowski [Wed, 29 Jan 2020 11:21:03 +0000 (03:21 -0800)]
Merge "Add ATT stub to prevent stack from crashing"
am:
d2ffe59ae2
Change-Id: I0d7535b13f94e41ad54d0ef8eabebbf3811692f3
Jakub Pawlowski [Wed, 29 Jan 2020 11:15:14 +0000 (11:15 +0000)]
Merge "Add ATT stub to prevent stack from crashing"
Jack He [Tue, 28 Jan 2020 03:33:45 +0000 (19:33 -0800)]
L2CAP socket: Stop L2CAP server by ID instead of PSM
* There could be multiple L2CAP socket control blocks with the same PSM
* The unique identifier for a L2CAP socket control block should be the
unique ID allocated during control block initialization
* Use this ID to track L2CAP socket control block instead of PSM ensure
that we close the correct socket
* Reset GAP handle and L2CAP socket ID to 0 when calling
bta_jv_free_l2c_cb() so that disconnected L2CAP control blocks does
not count
Test: CtsVerifier
Bug:
147997447
Bug:
144148429
Change-Id: Ideb428bc73aa0b36b8deb20fac280e44c8fe7db1
(cherry picked from commit
ad23e6b2f473829b1819918cd3f927d1134c83b3)
Jack He [Tue, 28 Jan 2020 01:09:17 +0000 (17:09 -0800)]
L2CAP Socket: Keep track of last allocated socket ID
* Keep track of last allocated socket ID in L2CAP socket stack
* Use last_sock_id + 1 as new IDs when allocating new socket blocks
* The de-dupe and overflow detection mechanism in btsock_l2cap_alloc_l()
would handle the uint32_t overflow and duplicate ID cases
Test: CtsBluetoothTestCases
Bug:
144148429
Change-Id: Ieb9791ffa34eef919a32e4aff6f4b514859c69c0
(cherry picked from commit
79eda3270bbd23814b5ec73ee3fd96ac80222db8)
Automerger Merge Worker [Wed, 29 Jan 2020 02:31:12 +0000 (02:31 +0000)]
Merge "L2CAP socket: Stop L2CAP server by ID instead of PSM" am:
35c0cc14eb am:
d639cc048b
Change-Id: I4b96331674d169e5372c69925fecd297b45d9aa3
Jack He [Wed, 29 Jan 2020 02:20:35 +0000 (18:20 -0800)]
Merge "L2CAP socket: Stop L2CAP server by ID instead of PSM"
am:
35c0cc14eb
Change-Id: Ia697096e48a0fb64e3f730cbbadc5c35d5c5264c
Treehugger Robot [Wed, 29 Jan 2020 02:17:40 +0000 (02:17 +0000)]
Merge "L2CAP socket: Stop L2CAP server by ID instead of PSM"
Automerger Merge Worker [Wed, 29 Jan 2020 01:31:55 +0000 (01:31 +0000)]
Cert: Set default log_path_base am:
afb14bc49d am:
c3931f6328
Change-Id: I861aad6b0123dc30a63151dcb2d05bcffa8fc958
Hansong Zhang [Wed, 29 Jan 2020 01:16:26 +0000 (17:16 -0800)]
Cert: Set default log_path_base
am:
afb14bc49d
Change-Id: I775a0deb2e8e26f7ff626489f6f7f87d89e56698
Jack He [Tue, 28 Jan 2020 03:33:45 +0000 (19:33 -0800)]
L2CAP socket: Stop L2CAP server by ID instead of PSM
* There could be multiple L2CAP socket control blocks with the same PSM
* The unique identifier for a L2CAP socket control block should be the
unique ID allocated during control block initialization
* Use this ID to track L2CAP socket control block instead of PSM ensure
that we close the correct socket
* Reset GAP handle and L2CAP socket ID to 0 when calling
bta_jv_free_l2c_cb() so that disconnected L2CAP control blocks does
not count
Test: CtsVerifier
Bug:
147997447
Bug:
144148429
Change-Id: Ideb428bc73aa0b36b8deb20fac280e44c8fe7db1
Hansong Zhang [Tue, 28 Jan 2020 23:29:40 +0000 (15:29 -0800)]
Cert: Set default log_path_base
If ACTS failed to set configs.log_path, use /tmp/logs
Test: cert/run_cert_facade_only.sh
Change-Id: If3ddc15dc04fedcb23e87ff45c2bf81f537fa11a
Automerger Merge Worker [Tue, 28 Jan 2020 20:17:02 +0000 (20:17 +0000)]
Reduce logspam in AclManager am:
0aef0449ad am:
3ab137a02f
Change-Id: I19ebc46debc8e6479e9db55cee88fc4d6b2ff331
Automerger Merge Worker [Tue, 28 Jan 2020 20:01:13 +0000 (20:01 +0000)]
Reduce logspam in AclManager am:
0aef0449ad
Change-Id: I7368d9c67dba938b5e3eb8202e342caee6f955b2
Jakub Pawlowski [Tue, 28 Jan 2020 15:53:20 +0000 (16:53 +0100)]
Add ATT stub to prevent stack from crashing
Bug:
142341141
Test: Connect to LE device, verify no crash happen when ATT packet is
received
Change-Id: Ia5e0352288565cd578fd163fe821b4d779ed762a
Jakub Pawlowski [Mon, 27 Jan 2020 15:21:12 +0000 (16:21 +0100)]
Reduce logspam in AclManager
Bug:
142341141
Test: receive long packet, verify next received packet doesn't print out
"Dropping invalid packet" line.
Change-Id: I5bd2ecf4200ec030a26d0313a528ff51531d6688
Automerger Merge Worker [Tue, 28 Jan 2020 03:43:31 +0000 (03:43 +0000)]
Merge "Move compiled grpc py to dist" am:
4666fbaa86 am:
48d8ae63aa
Change-Id: I576f233f3c1c44aaa2db17a99d7c874e7f0737e1
Hansong Zhang [Tue, 28 Jan 2020 03:36:40 +0000 (19:36 -0800)]
Merge "Move compiled grpc py to dist"
am:
4666fbaa86
Change-Id: Ibd2a5943f108ddd06816bf0551f3abd53fc49697
Treehugger Robot [Tue, 28 Jan 2020 03:28:32 +0000 (03:28 +0000)]
Merge "Move compiled grpc py to dist"