OSDN Git Service
Hansong Zhang [Mon, 17 Jun 2019 18:23:41 +0000 (11:23 -0700)]
Improve blocking queue am:
5453d12fa2
am:
fdec3d59a3
Change-Id: I32eec8dbfbf2ce9df8ca405146d1df0eee7cfbbd
Hansong Zhang [Mon, 17 Jun 2019 18:14:34 +0000 (11:14 -0700)]
Improve blocking queue
am:
5453d12fa2
Change-Id: Ic79f405ae2986694c0a0c443083f4eb8d34cc003
Hansong Zhang [Sat, 15 Jun 2019 15:12:55 +0000 (08:12 -0700)]
Improve blocking queue
Instead of take_for(), add a helper function to wait until the queue is
non-empty, so we don't require T to have a empty constructor.
Test: bluetooth_test_gd
Change-Id: Ia30a8149646fc75ecf19778888636c4129dbf100
Myles Watson [Fri, 14 Jun 2019 07:14:06 +0000 (00:14 -0700)]
PDL: Make GetPayload() const am:
cc278448fc
am:
9845dd3552
Change-Id: Ia1cddd470f6601161c5200f3fc78a80153b07458
Myles Watson [Fri, 14 Jun 2019 07:07:03 +0000 (00:07 -0700)]
PDL: Make GetPayload() const
am:
cc278448fc
Change-Id: Ib46b8be015e1a50540e4604c9d9c3a7cd55bfbb3
Myles Watson [Fri, 14 Jun 2019 04:14:44 +0000 (21:14 -0700)]
HAL: Add unregisterIncomingPacketCallback am:
13856b239a
am:
04657e6030
Change-Id: I155df3ecc36f47a700b3b36132c833e8495b84e3
Myles Watson [Fri, 14 Jun 2019 03:43:30 +0000 (20:43 -0700)]
HAL: Add unregisterIncomingPacketCallback
am:
13856b239a
Change-Id: I0365bd26b36c8242adfe278dd1ddd8729e2eaf98
Myles Watson [Fri, 17 May 2019 21:41:00 +0000 (14:41 -0700)]
PDL: Make GetPayload() const
Test: bluetooth_packet_parser_test
Change-Id: Icd2265863c694c0f794211e161bd50b6a20c25a5
Myles Watson [Tue, 11 Jun 2019 20:46:15 +0000 (13:46 -0700)]
HAL: Add unregisterIncomingPacketCallback
Test: bluetooth_test_gd
Change-Id: I17f8227c351451b4249c2a005ea4428ace734dc9
Jakub Pawlowski [Thu, 13 Jun 2019 22:44:03 +0000 (15:44 -0700)]
[automerger skipped] Fix for BluetoothGattCallback.onConnectionStateChange being called more than once
am:
981864174e -s ours
am skip reason: change_id Id94db9429e31224ef35eb2c99c0f9a65e7c27d32 with SHA1
f00142a4dc is in history
Change-Id: Ic916951801b2e1b973d2fe7a65b05282714f93da
Myles Watson [Thu, 13 Jun 2019 22:21:12 +0000 (15:21 -0700)]
HCI: Add a controller for properties and credits am:
b79d5ead27
am:
fb60b2b8f7
Change-Id: I70c142edbf8946bd4e3e074e580c6e8717e34f72
Myles Watson [Thu, 13 Jun 2019 22:06:18 +0000 (15:06 -0700)]
HCI: Add a controller for properties and credits
am:
b79d5ead27
Change-Id: I5b3cbb68be8fc7b8efdfa2c8ce2af0d3e36d680e
Myles Watson [Thu, 13 Jun 2019 20:56:29 +0000 (13:56 -0700)]
Merge "HCI: HCI command credit and timeout handling" am:
72c660d28c
am:
5e164adfe6
Change-Id: Ib412af78b4f8d229981e9a25e112e47aca8a1444
Myles Watson [Thu, 13 Jun 2019 20:46:47 +0000 (13:46 -0700)]
Merge "HCI: HCI command credit and timeout handling"
am:
72c660d28c
Change-Id: I58b65583a566ed4b751d2e8d9a5baa609c38fbc3
Myles Watson [Mon, 3 Jun 2019 23:33:59 +0000 (16:33 -0700)]
HCI: Add a controller for properties and credits
Test: bluetooth_test_gd --gtest_filter=*ControllerT*
Change-Id: Icd7c58e2e8314f6a75874ea7a98a1e23e8307ab6
Treehugger Robot [Thu, 13 Jun 2019 20:28:27 +0000 (20:28 +0000)]
Merge "HCI: HCI command credit and timeout handling"
Jakub Pawlowski [Thu, 13 Jun 2019 19:56:00 +0000 (12:56 -0700)]
Fix for BluetoothGattCallback.onConnectionStateChange being called more than once am:
f00142a4dc
am:
0a8b7ef782
Change-Id: I0aa3b1b32f53394fa399dd286f327a200c197ea4
Jakub Pawlowski [Thu, 13 Jun 2019 19:49:30 +0000 (12:49 -0700)]
Fix for BluetoothGattCallback.onConnectionStateChange being called more than once
am:
f00142a4dc
Change-Id: I8240774394507f70700257f68572d490a40e4d76
Jakub Pawlowski [Thu, 13 Jun 2019 14:31:53 +0000 (16:31 +0200)]
Fix for BluetoothGattCallback.onConnectionStateChange being called more than once
This patch fixes the issue, where the onConenctionStateCallback is being
called twice when device is connected. This happens only if device was
connected before, and the physical connection was kept alive.
This issue was introduced during white list refactor.
Test: GattConnectTest:test_gatt_connect_in_quick_succession
Bug:
117182283
Merged-In: Id94db9429e31224ef35eb2c99c0f9a65e7c27d32
Change-Id: Id94db9429e31224ef35eb2c99c0f9a65e7c27d32
Jakub Pawlowski [Thu, 13 Jun 2019 14:31:53 +0000 (16:31 +0200)]
Fix for BluetoothGattCallback.onConnectionStateChange being called more than once
This patch fixes the issue, where the onConenctionStateCallback is being
called twice when device is connected. This happens only if device was
connected before, and the physical connection was kept alive.
This issue was introduced during white list refactor.
Test: GattConnectTest:test_gatt_connect_in_quick_succession
Bug:
117182283
Change-Id: Id94db9429e31224ef35eb2c99c0f9a65e7c27d32
Myles Watson [Wed, 12 Jun 2019 21:57:46 +0000 (14:57 -0700)]
HCI: HCI command credit and timeout handling
Test: bluetooth_gd_test
Change-Id: Iff11fd2e21f71c23d716f7ca5f920490dd7c79f3
Hansong Zhang [Thu, 13 Jun 2019 01:48:30 +0000 (18:48 -0700)]
HCI layer: Synchronize API with handler am:
4564dc3a11
am:
96074b7879
Change-Id: I4ace861a9ea77a9fe0680d691b55701b8ea3fd08
Hansong Zhang [Thu, 13 Jun 2019 01:37:24 +0000 (18:37 -0700)]
HCI layer: Synchronize API with handler
am:
4564dc3a11
Change-Id: I3ea79233f6839314012ed994259560204387f46a
Hansong Zhang [Thu, 13 Jun 2019 00:26:35 +0000 (17:26 -0700)]
Replace std::function with base::Closure am:
aa0875c122
am:
29c6d79266
Change-Id: I1cccaac089ef12ac3d53a4b990684a049d922ad8
Hansong Zhang [Thu, 13 Jun 2019 00:21:20 +0000 (17:21 -0700)]
Replace std::function with base::Closure
am:
aa0875c122
Change-Id: I9548d5bc957c2cfeba89204cd3ac344e2cc6e40b
Myles Watson [Thu, 13 Jun 2019 00:07:06 +0000 (17:07 -0700)]
OS: Add ordering guarantees for Handler.Clear() am:
742fe6dbd1
am:
df0c6b1bac
Change-Id: I52a96903db88eb49f968526794f2af05c5dd66f7
Myles Watson [Wed, 12 Jun 2019 23:58:33 +0000 (16:58 -0700)]
OS: Add ordering guarantees for Handler.Clear()
am:
742fe6dbd1
Change-Id: I5b0cd1792b70b0dfff313743bf805b1a6e27440a
Myles Watson [Wed, 12 Jun 2019 22:42:37 +0000 (15:42 -0700)]
OS: Add Reactor::WaitForUnregisteredReactable() am:
a69e704b89
am:
f4ee85bb38
Change-Id: I46834ae6b7b5c0f97dec1422eb46142086df748a
Myles Watson [Wed, 12 Jun 2019 22:36:46 +0000 (15:36 -0700)]
OS: Add Reactor::WaitForUnregisteredReactable()
am:
a69e704b89
Change-Id: Id9fe47cbf624cc8b266fb6752857565c93c7192f
Hansong Zhang [Tue, 11 Jun 2019 23:02:35 +0000 (16:02 -0700)]
HCI layer: Synchronize API with handler
In HciLayer::impl, synchronize command_queue_, event_handlers_ with
handler within HciLayer module.
Use member function send_acl and send_sco instead of callback function.
Test: atest --host bluetooth_test_gd
Change-Id: Ibd541578828896fe9a5ccb42be7987a0fb556f6c
Hansong Zhang [Fri, 7 Jun 2019 04:44:55 +0000 (21:44 -0700)]
Replace std::function with base::Closure
std::function doesn't support non-copyable arguments. Use base::Closure
and base::OnceClosure from libchrome instead.
Test: atest --host bluetooth_test_gd
Change-Id: Ic18bbc000730e8b0d7acff0097870bd258ee6150
Myles Watson [Fri, 7 Jun 2019 15:57:16 +0000 (08:57 -0700)]
OS: Add ordering guarantees for Handler.Clear()
Assert that Clear() is called once before ~Handler()
Test: bluetooth_test_gd
Change-Id: I40f89d13a05deab5f0d7ab1596a9101b097ef52a
Myles Watson [Wed, 12 Jun 2019 17:19:17 +0000 (10:19 -0700)]
OS: Add Reactor::WaitForUnregisteredReactable()
Test: bluetooth_test_gd --gtest_filter=*ReactorTest*
Change-Id: I9328d6fcd40941b25d252abc563e2a933ec06c25
weichinweng [Wed, 12 Jun 2019 16:26:52 +0000 (09:26 -0700)]
[automerger skipped] Load gatt_database if it is empty in bta_gattc_process_indicate
am:
d8cdc6c2b8 -s ours
am skip reason: change_id Id3f3f0f33d5e0469a6f2ac6612fa9f5ea0b24142 with SHA1
9a169893a8 is in history
Change-Id: I83a3dc9edc8edffa560caab8dbf5edfd2aa4cb64
weichinweng [Wed, 12 Jun 2019 07:47:59 +0000 (00:47 -0700)]
Load gatt_database if it is empty in bta_gattc_process_indicate am:
9a169893a8
am:
f9b7dfff77
Change-Id: Iccffc6d9b8eef4f3f5d753d7d58633ead92c86db
weichinweng [Wed, 12 Jun 2019 07:42:58 +0000 (00:42 -0700)]
Load gatt_database if it is empty in bta_gattc_process_indicate
am:
9a169893a8
Change-Id: I962e5da7dae3f75965683d93b35cdbcbf14a7c7e
weichinweng [Tue, 11 Jun 2019 14:02:46 +0000 (22:02 +0800)]
Load gatt_database if it is empty in bta_gattc_process_indicate
If Service Changed indication is received but gatt_database is empty,
will try to load database from storage.
Bug:
131814072
Bug:
134994428
Test: 1.CTS Bluetooth LE Secure Test. 2.Unit test.
3. Pair BLE device via APP. 4. Pair device via Bluetooth Setting
Change-Id: Id3f3f0f33d5e0469a6f2ac6612fa9f5ea0b24142
Merged-In: Id3f3f0f33d5e0469a6f2ac6612fa9f5ea0b24142
weichinweng [Tue, 11 Jun 2019 14:02:46 +0000 (22:02 +0800)]
Load gatt_database if it is empty in bta_gattc_process_indicate
If Service Changed indication is received but gatt_database is empty,
will try to load database from storage.
Bug:
131814072
Bug:
134994428
Test: 1.CTS Bluetooth LE Secure Test. 2.Unit test.
3. Pair BLE device via APP. 4. Pair device via Bluetooth Setting
Change-Id: Id3f3f0f33d5e0469a6f2ac6612fa9f5ea0b24142
Jakub Pawlowski [Tue, 11 Jun 2019 22:03:08 +0000 (15:03 -0700)]
Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate"
am:
1ae89b7db2
Change-Id: I1b73fc8678d5db13d6c8886cb3d24d922e00ef4d
Jakub Pawlowski [Tue, 11 Jun 2019 18:42:02 +0000 (11:42 -0700)]
Merge "Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate"" am:
103addf9f7
am:
288ba569ff
Change-Id: I85c677627970ba098c1574509d9072e75e4abb98
Jakub Pawlowski [Tue, 11 Jun 2019 11:30:04 +0000 (11:30 +0000)]
Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate"
This reverts commit
ffc95919835bbf89d635516955bff1b3b8a17641.
Reason for revert: breaks HA bonding from within app.
Bug:
134942525
Change-Id: I824391b1c84b535d7f251e176a5169eb79921c7f
Jakub Pawlowski [Tue, 11 Jun 2019 18:37:02 +0000 (11:37 -0700)]
Merge "Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate""
am:
103addf9f7
Change-Id: I886067b43e87be5edce5b7486945e71d20875b77
Jakub Pawlowski [Tue, 11 Jun 2019 18:18:48 +0000 (18:18 +0000)]
Merge "Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate""
Jakub Pawlowski [Tue, 11 Jun 2019 11:30:04 +0000 (11:30 +0000)]
Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate"
This reverts commit
ffc95919835bbf89d635516955bff1b3b8a17641.
Reason for revert: breaks HA bonding from within app.
Bug:
134942525
Change-Id: I824391b1c84b535d7f251e176a5169eb79921c7f
Myles Watson [Tue, 11 Jun 2019 01:16:54 +0000 (18:16 -0700)]
OS: Update Handler unittest am:
6a3d2769e5
am:
06a6e601f3
Change-Id: I7edc71cc93e7fb3ab4822d70efa8c5a7bca04d38
Myles Watson [Tue, 11 Jun 2019 01:16:50 +0000 (18:16 -0700)]
OS: Don't hold the lock while the callback runs am:
5831f4165c
am:
5f46294fc0
Change-Id: I8681972873d01cb0d31e44e558a9f778e19161a0
Myles Watson [Tue, 11 Jun 2019 01:06:54 +0000 (18:06 -0700)]
OS: Update Handler unittest
am:
6a3d2769e5
Change-Id: I6435bafbaaaeda1cc61c9328d8c5a803be8bc76a
Myles Watson [Tue, 11 Jun 2019 01:06:51 +0000 (18:06 -0700)]
OS: Don't hold the lock while the callback runs
am:
5831f4165c
Change-Id: I4e478ca80801a896b5a46dea16475fb14eb3a6cb
Myles Watson [Fri, 7 Jun 2019 15:57:16 +0000 (08:57 -0700)]
OS: Update Handler unittest
Test: bluetooth_test_gd
Change-Id: I14bb8c8852d8749e9c531ac18f18a39c92dae922
Myles Watson [Mon, 10 Jun 2019 20:10:52 +0000 (13:10 -0700)]
OS: Don't hold the lock while the callback runs
Test: bluetooth_test_gd \
--gtest_filter=*unregister_from_different_thread*
Change-Id: Icd820cd1a68a6ec26f0284b5c2bd7ba673bebb0c
The Android Open Source Project [Mon, 10 Jun 2019 20:17:46 +0000 (13:17 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am:
5cf6a28c88 -s ours
am:
f2402e7b26 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibd8e4005bda46357ede597929f3d324d3cb95378
The Android Open Source Project [Mon, 10 Jun 2019 20:06:10 +0000 (13:06 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master
am:
5cf6a28c88 -s ours
am skip reason: subject contains skip directive
Change-Id: I415dbf27f8455439578babd75e4420522a3ba1a1
The Android Open Source Project [Mon, 10 Jun 2019 16:32:28 +0000 (09:32 -0700)]
DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master
Bug:
134605042
Change-Id: Icf8a142122c66c40c9e906380778d1d0237ba4be
Martin Brabham [Sat, 8 Jun 2019 05:01:14 +0000 (22:01 -0700)]
Confirm the presence of BT key when BT ON
am:
bd8c5865c9
Change-Id: I2ea7afb95bcb4f72f95688858cdb32e7d262c572
Martin Brabham [Fri, 31 May 2019 19:53:07 +0000 (12:53 -0700)]
Confirm the presence of BT key when BT ON
After clearing Bluetooth data, the Bluetooth key will be cleared in the
same time. When turn on Bluetooth, NE happened at the step of checking
Bluetooth key.
Bug:
133214365
Test: ahost --host test net_test_bluetooth
Change-Id: I88f5dfae07352a794b304da60e09253c004fb3d4
Jakub Pawlowski [Fri, 7 Jun 2019 10:28:35 +0000 (03:28 -0700)]
[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev am:
38535adcd0 -s ours am:
28a8e8b848 -s ours am:
c5837d3d81 -s ours am:
5b7daae369 -s ours
am:
4ea1ac1105 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history
Change-Id: I6b49af11ced9165f58df9237771f6d739128500c
Jakub Pawlowski [Fri, 7 Jun 2019 10:28:12 +0000 (03:28 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
461f0b4739 -s ours am:
35f2cb15f1 -s ours am:
75384547fb -s ours am:
dd59bd4400 -s ours
am:
82398ca371 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
c887dd6ed1 is in history
Change-Id: I86db4f91775e9bb362643a0145e900fd9a82ab5e
Jakub Pawlowski [Fri, 7 Jun 2019 10:23:30 +0000 (03:23 -0700)]
[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev am:
38535adcd0 -s ours am:
28a8e8b848 -s ours am:
c5837d3d81 -s ours
am:
5b7daae369 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history
Change-Id: I1dba0b8ab2cdb0363f6a53939385d2d6a45d18f7
Jakub Pawlowski [Fri, 7 Jun 2019 10:23:04 +0000 (03:23 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
461f0b4739 -s ours am:
35f2cb15f1 -s ours am:
75384547fb -s ours
am:
dd59bd4400 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifbda31c8076491dcf7c583ae6b7a12cf4c82a4f0
Jakub Pawlowski [Fri, 7 Jun 2019 10:18:27 +0000 (03:18 -0700)]
[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev am:
38535adcd0 -s ours am:
28a8e8b848 -s ours
am:
c5837d3d81 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history
Change-Id: Ia742ff3db6e10ecdcfae893a44ed3e766c40cbe6
Jakub Pawlowski [Fri, 7 Jun 2019 10:18:03 +0000 (03:18 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
461f0b4739 -s ours am:
35f2cb15f1 -s ours
am:
75384547fb -s ours
am skip reason: subject contains skip directive
Change-Id: I952f4abe93c3f75e9de141727606886ed234b8ad
Jakub Pawlowski [Fri, 7 Jun 2019 10:12:23 +0000 (03:12 -0700)]
[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev am:
38535adcd0 -s ours
am:
28a8e8b848 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history
Change-Id: I128d6b1fbeccea202ddaaa73e4a1c9032afdfda1
Jakub Pawlowski [Fri, 7 Jun 2019 10:12:08 +0000 (03:12 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
461f0b4739 -s ours
am:
35f2cb15f1 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
bdac7b911f is in history
Change-Id: Idd9e3a1ffa28ca0de51f37b043c452b0cde9fcfe
Jakub Pawlowski [Fri, 7 Jun 2019 10:08:32 +0000 (03:08 -0700)]
[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev
am:
38535adcd0 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history
Change-Id: I14e6e0212fd40a7a74cc9f4672cd8ce611763761
Jakub Pawlowski [Fri, 7 Jun 2019 10:08:09 +0000 (03:08 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
am:
461f0b4739 -s ours
am skip reason: SHA1
461f0b4739 skipped by user jpawlowski
Change-Id: If029a012222cb9a45a593282524518f30f9f0dc6
Xin Li [Fri, 7 Jun 2019 07:28:10 +0000 (00:28 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master
am:
9b39d9698a -s ours
am skip reason: subject contains skip directive
Change-Id: I89da2ee16fdd9cc9d081fc762e816573f866449a
Xin Li [Fri, 7 Jun 2019 07:16:26 +0000 (00:16 -0700)]
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master
am:
11c90c6751 -s ours
am skip reason: subject contains skip directive
Change-Id: I8438b91376b5ec5bc320beb7f51c3e66e8d51ba3
TreeHugger Robot [Fri, 7 Jun 2019 07:06:20 +0000 (07:06 +0000)]
Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master
Xin Li [Wed, 5 Jun 2019 22:41:48 +0000 (15:41 -0700)]
DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master
Bug:
134605042
Change-Id: I5be87422d75fb89d35135a5e087920fae1f6b2d6
Jakub Pawlowski [Thu, 6 Jun 2019 19:47:12 +0000 (19:47 +0000)]
Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev
* changes:
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba am:
20f1cf2b81 skipped:
cb880ad379
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba am:
20f1cf2b81
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf
DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
Jakub Pawlowski [Thu, 6 Jun 2019 19:02:17 +0000 (12:02 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
bdac7b911f -s ours am:
35f034bb61 -s ours
am:
04d073cb2d -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
c978f86b50 is in history
Change-Id: I3b83079687a96a764a6879e2acd7e730741b531c
Jakub Pawlowski [Thu, 6 Jun 2019 19:01:56 +0000 (12:01 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c978f86b50 -s ours
am:
332964b0ad -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
c887dd6ed1 is in history
Change-Id: I2749b277c011f2d9d10f3a54a6729690ac2795f5
Jakub Pawlowski [Thu, 6 Jun 2019 18:56:16 +0000 (11:56 -0700)]
Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
am:
c887dd6ed1
Change-Id: Idbde20caeaaa39c1ab256b11cc6a984f5d441132
Jakub Pawlowski [Thu, 6 Jun 2019 18:56:11 +0000 (11:56 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
bdac7b911f -s ours
am:
35f034bb61 -s ours
am skip reason: subject contains skip directive
Change-Id: Icfbb46e23894cdf4baf3ded483a169ab5ea225ff
Jakub Pawlowski [Thu, 6 Jun 2019 18:55:49 +0000 (11:55 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
am:
c978f86b50 -s ours
am skip reason: subject contains skip directive
Change-Id: I3bed57af388e87495b43a36ae51b3460a0829e99
Jakub Pawlowski [Thu, 6 Jun 2019 18:54:46 +0000 (11:54 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
am:
bdac7b911f -s ours
am skip reason: subject contains skip directive
Change-Id: Ibddb04bcbe2ff0c0197071492e58abee2037d7dc
Android Build Merger (Role) [Thu, 6 Jun 2019 14:32:33 +0000 (14:32 +0000)]
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba am:
20f1cf2b81 skipped:
cb880ad379
Change-Id: I0ce92d6832d71961c2774d523ccaff25aae6ee75
Android Build Merger (Role) [Thu, 6 Jun 2019 14:32:29 +0000 (14:32 +0000)]
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba am:
20f1cf2b81
Change-Id: I462281e1e328875bff50defc951aa436245740da
Android Build Merger (Role) [Thu, 6 Jun 2019 14:32:26 +0000 (14:32 +0000)]
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba
Change-Id: Idcdaee2b8091c775df14722a28b56589957833f2
Android Build Merger (Role) [Thu, 6 Jun 2019 14:32:23 +0000 (14:32 +0000)]
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245
Change-Id: I570033782572166e69cd1edd65260c499473a661
Android Build Merger (Role) [Thu, 6 Jun 2019 14:32:19 +0000 (14:32 +0000)]
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf
Change-Id: Id7ceb1b67894931e9c0ce188dff19177afd4a7ee
Jakub Pawlowski [Thu, 6 Jun 2019 11:54:55 +0000 (13:54 +0200)]
DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
If remote device stop the encryption before we call "Read Encryption Key Size",
we might receive Insufficient Security, which means that link is no longer
encrypted.
In such cases we should stay connected, rather than disconnecting the
link.
Test: Connect to device that stop encryption right after encryption is
complete, i.e. to change roles.
Bug:
124301137
Bug:
132626699
Change-Id: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Merged-In: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Jakub Pawlowski [Thu, 6 Jun 2019 11:54:55 +0000 (13:54 +0200)]
DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
If remote device stop the encryption before we call "Read Encryption Key Size",
we might receive Insufficient Security, which means that link is no longer
encrypted.
In such cases we should stay connected, rather than disconnecting the
link.
Test: Connect to device that stop encryption right after encryption is
complete, i.e. to change roles.
Bug:
124301137
Bug:
132626699
Change-Id: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Merged-In: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Jakub Pawlowski [Thu, 6 Jun 2019 11:54:55 +0000 (13:54 +0200)]
DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
If remote device stop the encryption before we call "Read Encryption Key Size",
we might receive Insufficient Security, which means that link is no longer
encrypted.
In such cases we should stay connected, rather than disconnecting the
link.
Test: Connect to device that stop encryption right after encryption is
complete, i.e. to change roles.
Bug:
124301137
Bug:
132626699
Change-Id: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Merged-In: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Jakub Pawlowski [Thu, 6 Jun 2019 11:54:55 +0000 (13:54 +0200)]
DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
If remote device stop the encryption before we call "Read Encryption Key Size",
we might receive Insufficient Security, which means that link is no longer
encrypted.
In such cases we should stay connected, rather than disconnecting the
link.
Test: Connect to device that stop encryption right after encryption is
complete, i.e. to change roles.
Bug:
124301137
Bug:
132626699
Change-Id: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Merged-In: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Jakub Pawlowski [Thu, 6 Jun 2019 11:54:55 +0000 (13:54 +0200)]
Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
If remote device stop the encryption before we call "Read Encryption Key Size",
we might receive Insufficient Security, which means that link is no longer
encrypted.
In such cases we should stay connected, rather than disconnecting the
link.
Test: Connect to device that stop encryption right after encryption is
complete, i.e. to change roles.
Bug:
124301137
Bug:
132626699
Change-Id: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Myles Watson [Wed, 5 Jun 2019 23:58:02 +0000 (16:58 -0700)]
Merge "OS: Create Alarms on a Handler's thread" am:
e1c1b2d8f6
am:
0cd3a70bce
Change-Id: I8fd5f527037428ce79d2a3068d9393a939c5f79d
Myles Watson [Wed, 5 Jun 2019 23:41:55 +0000 (16:41 -0700)]
Merge "OS: Create Alarms on a Handler's thread"
am:
e1c1b2d8f6
Change-Id: Ie4238a454195704381a14337cf6c62ba340569f4
Treehugger Robot [Wed, 5 Jun 2019 23:15:28 +0000 (23:15 +0000)]
Merge "OS: Create Alarms on a Handler's thread"
Myles Watson [Mon, 3 Jun 2019 16:25:28 +0000 (09:25 -0700)]
OS: Create Alarms on a Handler's thread
Test: bluetooth_test_gd --gtest_filter=*Alarm*
Change-Id: I017a5f74f1d72468ca487536c88a0cf3eb48ddea
Ugo Yu [Wed, 5 Jun 2019 19:58:58 +0000 (12:58 -0700)]
[automerger skipped] Rename and reset the proirity of HID host thread
am:
eb2a389a9e -s ours
am skip reason: change_id Ibd983e96bc339393842d4c2e2aa226534095e225 with SHA1
4e25ef13b2 is in history
Change-Id: If40ad0ad1e12686a38caabbe09446fbe4466956e
Ugo Yu [Wed, 5 Jun 2019 17:35:19 +0000 (10:35 -0700)]
Rename and reset the proirity of HID host thread am:
4e25ef13b2
am:
76e26cffbb
Change-Id: I0dccf0d64ce506a61f11fe411b27f9b2cc339d9d
Ugo Yu [Wed, 5 Jun 2019 17:30:25 +0000 (10:30 -0700)]
Rename and reset the proirity of HID host thread
am:
4e25ef13b2
Change-Id: If957c7e793d4ae2462d9b1c5a57e17a91224d02a
Ugo Yu [Wed, 5 Jun 2019 12:08:29 +0000 (20:08 +0800)]
Rename and reset the proirity of HID host thread
* Rename the HH event polling thread to bt_hh_thread
* HH event polling thread is created by bt_main_thread
with RT priority. Lower the thread priority since the
tasks in this thread is not timing critical
Bug:
131787936
Test: Connect to a HID device
Run "adb shell ps -A -T -Z -O rtprio"
Change-Id: Ibd983e96bc339393842d4c2e2aa226534095e225
Merged-In: Ibd983e96bc339393842d4c2e2aa226534095e225
Ugo Yu [Wed, 5 Jun 2019 12:08:29 +0000 (20:08 +0800)]
Rename and reset the proirity of HID host thread
* Rename the HH event polling thread to bt_hh_thread
* HH event polling thread is created by bt_main_thread
with RT priority. Lower the thread priority since the
tasks in this thread is not timing critical
Bug:
131787936
Test: Connect to a HID device
Run "adb shell ps -A -T -Z -O rtprio"
Change-Id: Ibd983e96bc339393842d4c2e2aa226534095e225
Ugo Yu [Wed, 5 Jun 2019 04:09:41 +0000 (21:09 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
b751ea3a90 am:
2b3330a139 -s ours am:
d9997755f9 -s ours am:
0f3b13b40e -s ours
am:
a2185db6d3 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: Idc71ae33d1290847f33c1f040dabe79bcaa5f767
Ugo Yu [Wed, 5 Jun 2019 04:09:29 +0000 (21:09 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881 am:
5f8f0c8b74 -s ours am:
1d7523417e -s ours am:
1c2cf08476 -s ours
am:
28c62892b6 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: I187533195bf8dadbbe002259b03679349f10954f
Jakub Pawlowski [Wed, 5 Jun 2019 04:09:07 +0000 (21:09 -0700)]
Merge "Hearing Aid: properly track audio Suspend/Resume" into qt-dev
am:
24e8293439
Change-Id: I93aca174d8272b3ff8f39dacf194584f38002ba5
Ugo Yu [Wed, 5 Jun 2019 04:07:13 +0000 (21:07 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
b751ea3a90 am:
2b3330a139 -s ours am:
d9997755f9 -s ours
am:
0f3b13b40e -s ours
am skip reason: subject contains skip directive
Change-Id: I55f9c0499721b51ba077b8743835fbead8edc775
Ugo Yu [Wed, 5 Jun 2019 04:07:07 +0000 (21:07 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881 am:
5f8f0c8b74 -s ours am:
1d7523417e -s ours
am:
1c2cf08476 -s ours
am skip reason: subject contains skip directive
Change-Id: I72d5bbb01e393fb940bad5cc58e51e71f6d5b200