OSDN Git Service
weichinweng [Fri, 2 Aug 2019 08:43:09 +0000 (16:43 +0800)]
Distribute ACL buffer only for not BLE device
If LE ACL buffer is not zero from controller, will distribute ACL buffer
only for not BLE device to avoid assigning wrong quota to each device.
For BLE device, will be distribute BLE ACL buffer via l2cap ble layer.
If LE ACL buffe is zero from controller, will keep existing logic.
Bug:
136799551
Test: 1. Pair BLE and BREDR device, check whether Quota is correct.
Change-Id: Idd7079e8da3390fa9f4e42b07774df8928f2bf20
Merged-In: Idd7079e8da3390fa9f4e42b07774df8928f2bf20
Ugo Yu [Thu, 25 Jul 2019 02:03:16 +0000 (19:03 -0700)]
Store BLE keys using the address from the ble_auth_cmpl_evt
am:
311ebcedb3
Change-Id: Id473a3eac5719cf890148dc43f29becd16584fe6
Ugo Yu [Thu, 11 Jul 2019 12:12:42 +0000 (20:12 +0800)]
Store BLE keys using the address from the ble_auth_cmpl_evt
Reading the peer address from btif_dm_ble_auth_cmpl_evt, instead
of using the value from the pairing control block in
btif_dm_save_ble_bonding_keys, ensures that BLE keys are stored with
the correct address.
Bug:
133234174
Bug:
79703832
Test: 1. Initiate crosskey pairing from BLE
2. Check whether BLE keys are stored correctly
Change-Id: I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff
Andre Eisenbach [Wed, 10 Jul 2019 20:30:43 +0000 (13:30 -0700)]
Switch Nintendo workaround to match by name
am:
c14c14fbc4
Change-Id: I89b558a9b3e87b58e15a8358fa66258fc03a882f
Andre Eisenbach [Wed, 10 Jul 2019 20:30:00 +0000 (13:30 -0700)]
Match Nintento Pro Controller by name for interop
am:
b71ebf2d82
Change-Id: I683d6dabefeeed51e1a1e9919d3c1b1d28a47647
weichinweng [Wed, 3 Jul 2019 09:52:19 +0000 (17:52 +0800)]
Hearing Aid: set BLE phy to 2M if local and peer indicate PHY 2M support
Set the BLE phy to 2M if the BT controller and peer Hearing Aid device
indicate phy 2M support, otherwise, use default phy channel.
Bug:
135769508
Test: 1.Forget/Repair Hearing Aid device check whether phy is expected.
2.Disconnect/Reconnect Hearing Aid device check whether phy is expected.
3.HearingAid device power off/on, check whether phy is expected.
Change-Id: Ib410a8885f3a68c361bb97d5c9a3833f2a1be528
Merged-In: Ib410a8885f3a68c361bb97d5c9a3833f2a1be528
(cherry picked from commit
554c3598db5661ac0166eb12006d248a38723db1)
Andre Eisenbach [Mon, 8 Jul 2019 21:49:06 +0000 (14:49 -0700)]
Switch Nintendo workaround to match by name
Bug:
136478524
Test: manual
Change-Id: Ib60cd5adfc4db3ba93fe5ed8c15353225b6cf165
Andre Eisenbach [Mon, 1 Jul 2019 17:48:10 +0000 (10:48 -0700)]
Match Nintento Pro Controller by name for interop
The Nintento Pro Controller uses an unknown number of
BDA ranges (at least 3 found internally). Switching
to name matching...
Bug:
136478524
Test: manual
Change-Id: Ie2dfb700c9550af0c314759ec496a04a8e1aa062
Myles Watson [Wed, 3 Jul 2019 23:08:24 +0000 (16:08 -0700)]
RootCanal: Set the timer period to 1 second
am:
eb9a775086
Change-Id: Iaf7e4e6bab48fd9f882c2d0e0c53b1cd71e7ff65
Myles Watson [Mon, 1 Jul 2019 22:22:26 +0000 (15:22 -0700)]
RootCanal: Set the timer period to 1 second
Reduce the CPU overhead of simulating the Bluetooth chip.
Bug:
136503363
Test: enable Bluetooth with RootCanal
Change-Id: I3a783a4d8a46d4eef43ddbace23c672ef9f6d7f9
Merged-In: I609f917061e5d83e011edfeb61de281ff45b13e4
Myles Watson [Mon, 1 Jul 2019 22:31:26 +0000 (15:31 -0700)]
Merge "RootCanal: Make beacons less verbose" into qt-dev
am:
155a2373f3
Change-Id: I45556790bd687e82aa2bd2effc084a5aab1160e0
TreeHugger Robot [Mon, 1 Jul 2019 22:11:59 +0000 (22:11 +0000)]
Merge "RootCanal: Make beacons less verbose" into qt-dev
Myles Watson [Wed, 26 Jun 2019 17:27:19 +0000 (10:27 -0700)]
RootCanal: Make beacons less verbose
Fixes:
136287879
Test: scan for Bluetooth devices, watch logcat
Change-Id: I971a7e56359adc39d006a1b10b5333c2f31ebaff
(cherry picked from commit
0d5adc6fac590dc14f46790b3962c40712303aea)
Myles Watson [Thu, 27 Jun 2019 20:53:01 +0000 (13:53 -0700)]
DO NOT MERGE RootCanal: Always add default devices
am:
6160b51adc
Change-Id: I11a3328b78eb69c85ab98038aa2558c442d659cb
Myles Watson [Fri, 21 Jun 2019 13:04:08 +0000 (06:04 -0700)]
DO NOT MERGE RootCanal: Always add default devices
Fixes:
129546852
Test: android.bluetooth.cts.BluetoothLeScanTest#testBasicBleScan
Change-Id: I9912dc7a98155972483e1e1dca812ebbae806bdd
(cherry picked from commit
38767e7f973616ecd020e90572d6ddc73e24c5e3)
Merged-In: I9912dc7a98155972483e1e1dca812ebbae806bdd
Zhijun He [Wed, 19 Jun 2019 05:50:52 +0000 (22:50 -0700)]
Revert "libprocessgroup users use libcutils"
am:
0c4d5997a4
Change-Id: I6f8a2df19c34ad55ee692d33404b988658c62294
Zhijun He [Wed, 19 Jun 2019 04:44:18 +0000 (04:44 +0000)]
Revert "libprocessgroup users use libcutils"
This reverts commit
93e1622ba65005d5611fc315503e4ed2f8a09658.
Reason for revert: breaks all camera use cases
Bug:
135568875
Exempt-From-Owner-Approval: revert, no build cop
Change-Id: I0b75d516e10a3432c71efd70ff100bf51e0e6d43
Andre Eisenbach [Wed, 19 Jun 2019 03:30:12 +0000 (20:30 -0700)]
Limit sniff mode for Nintendo Pro Controller to 11.25ms
am:
85d56a8d38
Change-Id: Ic6398eb054f7bc20c7ab4dc2ee1e603c683c9044
Martin Brabham [Wed, 19 Jun 2019 03:24:50 +0000 (20:24 -0700)]
Merge "Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP"" into qt-dev
am:
1d0646a396
Change-Id: Id2b5882b6c198e56f3c1dcd633fe970c3df3abf1
Martin Brabham [Wed, 19 Jun 2019 03:24:46 +0000 (20:24 -0700)]
Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP"
am:
19d8c6e7c9
Change-Id: I382332aab1abdc37bd90db1ef7821b6df3a6cb91
Andre Eisenbach [Thu, 13 Jun 2019 18:50:57 +0000 (11:50 -0700)]
Limit sniff mode for Nintendo Pro Controller to 11.25ms
Bug:
133410149
Test: manual
Change-Id: I4bffb759323bedd36e754cf758ac1d61cffc886e
(cherry picked from commit
b62d0a17ec545fb477a5155790e9e96d1472659b)
TreeHugger Robot [Wed, 19 Jun 2019 01:30:38 +0000 (01:30 +0000)]
Merge "Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP"" into qt-dev
Martin Brabham [Fri, 14 Jun 2019 16:27:42 +0000 (16:27 +0000)]
Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP"
This reverts commit
9437cbc24014799738c85da8f416a647f8cbf3e2.
Reason for revert: Waiting for QT first SMR due to b/
134461862
Bug:
134461862
Change-Id: I3fea0f2d10658d6e154a946eaaa9fbdeb4b49159
Steven Moreland [Tue, 18 Jun 2019 23:48:59 +0000 (16:48 -0700)]
libprocessgroup users use libcutils
am:
93e1622ba6
Change-Id: Ia39a50ffff1c8d9011df0f1fb9f399940c8e4b88
Steven Moreland [Thu, 13 Jun 2019 00:18:46 +0000 (17:18 -0700)]
libprocessgroup users use libcutils
libprocessgroup symbols are being moved into libcutils in order to
optimize linking/memory usage. libprocessgroup will no longer be
required in the future (however removing references to it will come
separately).
Bug:
135145426
Test: boot
Change-Id: I46710da29212572068f6e96967f42523455f1446
Jakub Pawlowski [Thu, 13 Jun 2019 22:44:03 +0000 (15:44 -0700)]
Fix for BluetoothGattCallback.onConnectionStateChange being called more than once
am:
981864174e
Change-Id: Id83a8fa757cd2b2017ec373d96f83cba7a4abb99
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
weichinweng [Wed, 12 Jun 2019 16:24:44 +0000 (09:24 -0700)]
Load gatt_database if it is empty in bta_gattc_process_indicate
am:
d8cdc6c2b8
Change-Id: Ic21850a535194b85aa558fe97b8118e0e089581e
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
Jakub Pawlowski [Tue, 11 Jun 2019 22:01:23 +0000 (15:01 -0700)]
Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate"
am:
1ae89b7db2
Change-Id: I7dd5e73de79498e378d24140a3ff4790a4138dac
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
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: If3b988395c9b09d4b8809edb944a5d5830a3821c
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:34 +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: I71b353a5efbc64b10ff787c98157107e30b9b4c0
Jakub Pawlowski [Fri, 7 Jun 2019 10:28:13 +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: I52a7a78da40b378f0b20112f759830f75c834813
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
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:01:55 +0000 (12:01 -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: I15822e529aac0cb7c92f105680bd4f92e80803a5
Jakub Pawlowski [Thu, 6 Jun 2019 19:01:36 +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: I793f3ff6b902aaedf590ea9c3c7f7060cbf5b8e9
Jakub Pawlowski [Thu, 6 Jun 2019 19:01:13 +0000 (12:01 -0700)]
Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
am:
c887dd6ed1
Change-Id: I391cfa47c88580d6a18510f2186d8560d023287e
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
Ugo Yu [Wed, 5 Jun 2019 19:56:04 +0000 (12:56 -0700)]
Rename and reset the proirity of HID host thread
am:
eb2a389a9e
Change-Id: Id5519e905054ab98f8c37537e9c4dc522cad4680
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 04:09:42 +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: I3eec2a4f9bf59500f160eab2aa673f434f7b551b
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: Iebb4af47eb8651bdb6c3192743c710e02668b070
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: I944dc3d531dfa8217810acc8862094e9fd41a1de
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
Ugo Yu [Wed, 5 Jun 2019 03:56:43 +0000 (20:56 -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 skip reason: subject contains skip directive
Change-Id: Idcf3e6f5276592b17693e89c8a56b37c7b445688
Ugo Yu [Wed, 5 Jun 2019 03:56:38 +0000 (20:56 -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 skip reason: subject contains skip directive
Change-Id: I2b8a32d29676a1ea7de1d26f700a5ac1930ea385
TreeHugger Robot [Wed, 5 Jun 2019 03:54:08 +0000 (03:54 +0000)]
Merge "Hearing Aid: properly track audio Suspend/Resume" into qt-dev
Ugo Yu [Wed, 5 Jun 2019 03:51:54 +0000 (20:51 -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 skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: I739288fe523814fce940eb2b33aa84d328af92c0
Ugo Yu [Wed, 5 Jun 2019 03:51:42 +0000 (20:51 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881
am:
5f8f0c8b74 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: I03fe1c7c5a372fd126e9885a4412c2b63b138751
Ugo Yu [Wed, 5 Jun 2019 03:44:59 +0000 (20:44 -0700)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev
am:
b751ea3a90
Change-Id: I4fd4b7d5d0328f40688fa2cd2321b95c12beb99e
Ugo Yu [Wed, 5 Jun 2019 03:44:47 +0000 (20:44 -0700)]
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am:
5240e71881
Change-Id: I12aa00ba24326d58ce73f15b6ddc82f22201945e
TreeHugger Robot [Wed, 5 Jun 2019 03:26:32 +0000 (03:26 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev
Ugo Yu [Wed, 5 Jun 2019 03:04:33 +0000 (20:04 -0700)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into oc-dev am:
421f1492da am:
c0f88cbbfd am:
fa24cbf097 am:
7625320871
am:
d3d63acf58
Change-Id: Ia40d5f14140399169cded615cbe1fba5a438f50b
Ugo Yu [Wed, 5 Jun 2019 03:04:27 +0000 (20:04 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348 am:
6976e5f214 skipped:
575b8c810b am:
5b7685e7a2 am:
f4da01925c am:
0a1f845e2a -s ours am:
840a9ba63e -s ours
am:
36c6a3069a
Change-Id: Ibe83621a1cbb8e7be9bbdfecf5a8658b09525d75
Ugo Yu [Wed, 5 Jun 2019 02:49:23 +0000 (19:49 -0700)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into oc-dev am:
421f1492da am:
c0f88cbbfd am:
fa24cbf097
am:
7625320871
Change-Id: I4e49782d45cd3132456019979e20e8c63fe58def
Ugo Yu [Wed, 5 Jun 2019 02:49:18 +0000 (19:49 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348 am:
6976e5f214 skipped:
575b8c810b am:
5b7685e7a2 am:
f4da01925c am:
0a1f845e2a -s ours
am:
840a9ba63e -s ours
am skip reason: subject contains skip directive
Change-Id: Ib56723082e3f9696d84423d254b5830af5e19253
Ugo Yu [Wed, 5 Jun 2019 02:31:14 +0000 (19:31 -0700)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into oc-dev am:
421f1492da am:
c0f88cbbfd
am:
fa24cbf097
Change-Id: I332b22ee718458d95df4e549238244f3117aa294
Ugo Yu [Wed, 5 Jun 2019 02:31:09 +0000 (19:31 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348 am:
6976e5f214 skipped:
575b8c810b am:
5b7685e7a2 am:
f4da01925c
am:
0a1f845e2a -s ours
am skip reason: subject contains skip directive
Change-Id: Ice9aadfba47ba6e146de0123f17d7703b650605a
Ugo Yu [Wed, 5 Jun 2019 02:21:21 +0000 (19:21 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev am:
1ab9bad8f3 -s ours am:
cc98ca6dd2 -s ours
am:
f92efc538b
Change-Id: Iae50a817a62c92c3455477cf8576471ca86429c3
Ugo Yu [Wed, 5 Jun 2019 02:20:28 +0000 (19:20 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
9d5a28a536 -s ours am:
4a0d26a8f3 -s ours
am:
2bd5b33135
Change-Id: I4094119aabecb737afce2a82a09d4711ddf52cb3
Ugo Yu [Wed, 5 Jun 2019 02:15:46 +0000 (19:15 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev am:
e488319d82 -s ours
am:
c7ee86a352
Change-Id: I8a5f0c4846a71dd0ee1146ac7b5a4f7208cf9fa9
Ugo Yu [Thu, 23 May 2019 11:54:41 +0000 (19:54 +0800)]
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
- Do not stay in bonding state if the device is paried but still
discovering service.
- Report BOND_BONDED to Java after authentication for a classic
Bluetooth device is completed.
- Send BONDING event to Java when static identity address is
first obtained during crosskey pairing
- Send BONDING event to Java for the initial random address
before send BONDED event
- Do not send bond event for static identity address when SDP is done.
- Make sure pairing control block always get cleaned up when both SDP
and pairing are done
- Send empty UUIDs to Java layer to unblock bonding intent broadcast
when SDP fails
Bug:
79703832
Test: runtest bluetooth, regression test
Change-Id: I60d8883e6d095b440cce49686a2049c8b5660235
Merged-In: I8a98ba2178039e25c65fc701855066a8788312e6
Ugo Yu [Wed, 5 Jun 2019 01:55:52 +0000 (18:55 -0700)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into oc-dev am:
421f1492da
am:
c0f88cbbfd
Change-Id: I5f81bb5a561e3da0a06d4d75f99f7894648b82d6
Ugo Yu [Wed, 5 Jun 2019 01:55:48 +0000 (18:55 -0700)]
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348 am:
6976e5f214 skipped:
575b8c810b am:
5b7685e7a2
am:
f4da01925c
Change-Id: I548d7448fa6562b01ca6f8d7b63621f17679945c
Ugo Yu [Wed, 5 Jun 2019 01:13:02 +0000 (18:13 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev am:
1ab9bad8f3 -s ours
am:
cc98ca6dd2 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic22afab361dac6bbdde1f7c792886197b62d873d
Ugo Yu [Wed, 5 Jun 2019 01:12:19 +0000 (18:12 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
9d5a28a536 -s ours
am:
4a0d26a8f3 -s ours
am skip reason: subject contains skip directive
Change-Id: I91b43f29574e5f14706de654f2449a765adbb119
Ugo Yu [Wed, 5 Jun 2019 01:11:31 +0000 (18:11 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev
am:
e488319d82 -s ours
am skip reason: subject contains skip directive
Change-Id: I41fb2cdaaab4b9ddab2aa5465a33e02523676df8
Ugo Yu [Wed, 5 Jun 2019 01:03:32 +0000 (18:03 -0700)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into oc-dev
am:
421f1492da
Change-Id: I7644ef835cc0177d110de369dfae0a01225bdcbb
Ugo Yu [Wed, 5 Jun 2019 01:03:30 +0000 (18:03 -0700)]
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348 am:
6976e5f214 skipped:
575b8c810b
am:
5b7685e7a2
Change-Id: I13263a937d23bbfd624afcb92f5a4b76f240a258
Jakub Pawlowski [Tue, 4 Jun 2019 21:23:16 +0000 (23:23 +0200)]
Hearing Aid: properly track audio Suspend/Resume
When audio is suspended or resumed, we are notified by OnAudioSuspend or
OnAudioResume callback. Unfortunately, when we are the one triggering
the HearingAidAudioSource::Stop(), we would not receive the suspend
callback. This is causing HA to believe audio is being streamed when
it's not.
This patch fixes that by setting audio_running to false when we make
call to Stop()
Bug:
132793574
Test: Play audio, restart Hearing Aid, verify START command is not being
sent
Change-Id: I3c4551114ac275ea8c72f64a8d036373429acd6d
Ugo Yu [Tue, 4 Jun 2019 19:56:38 +0000 (12:56 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev
am:
1ab9bad8f3 -s ours
am skip reason: subject contains skip directive
Change-Id: I3bc81925f4a8a1f8d467d348fa5844fd1230cf6c
Ugo Yu [Tue, 4 Jun 2019 19:44:40 +0000 (12:44 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am:
9d5a28a536 -s ours
am skip reason: subject contains skip directive
Change-Id: I09c517978113a8837c1cbccab61fa75eb7f199fd
TreeHugger Robot [Tue, 4 Jun 2019 17:33:21 +0000 (17:33 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev
TreeHugger Robot [Tue, 4 Jun 2019 17:09:40 +0000 (17:09 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev
TreeHugger Robot [Tue, 4 Jun 2019 16:39:19 +0000 (16:39 +0000)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348 am:
6976e5f214
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
TreeHugger Robot [Tue, 4 Jun 2019 16:39:19 +0000 (16:39 +0000)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into cw-f-dev
* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
TreeHugger Robot [Tue, 4 Jun 2019 16:39:19 +0000 (16:39 +0000)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719
DO NOT MERGE Separate SDP procedure from bonding state (1/2)