OSDN Git Service
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: I954c6cc25d3948c788d524ccde4a0850770a5802
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:59:00 +0000 (13:59 -0700)]
[automerger skipped] DO NOT MERGE RootCanal: Always add default devices
am:
6160b51adc -s ours
am skip reason: change_id I9912dc7a98155972483e1e1dca812ebbae806bdd with SHA1
38767e7f97 is in history
Change-Id: I6504ba185e795910a4d22baabe5aa2df00622969
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
Myles Watson [Thu, 27 Jun 2019 01:16:25 +0000 (18:16 -0700)]
RootCanal: Always add default devices am:
38767e7f97
am:
afa1291441
Change-Id: Ia1a98567a2a488fa10a471b260940a866140c186
Myles Watson [Thu, 27 Jun 2019 00:57:21 +0000 (17:57 -0700)]
RootCanal: Always add default devices
am:
38767e7f97
Change-Id: I4d195262aa4870fa1d4a22311a46124f4dfe4590
Myles Watson [Wed, 26 Jun 2019 22:22:57 +0000 (15:22 -0700)]
RootCanal: Make beacons less verbose am:
0d5adc6fac
am:
ab787f6d8b
Change-Id: Ib8281ac397f1c90635396e62f35b8b24146538fb
Myles Watson [Wed, 26 Jun 2019 22:07:44 +0000 (15:07 -0700)]
RootCanal: Make beacons less verbose
am:
0d5adc6fac
Change-Id: Ice56f0195d802e1fa3a143c7285f0eded1578a93
Myles Watson [Fri, 21 Jun 2019 13:04:08 +0000 (06:04 -0700)]
RootCanal: Always add default devices
Bug:
129546852
Test: android.bluetooth.cts.BluetoothLeScanTest#testBasicBleScan
Change-Id: I9912dc7a98155972483e1e1dca812ebbae806bdd
Myles Watson [Wed, 26 Jun 2019 17:27:19 +0000 (10:27 -0700)]
RootCanal: Make beacons less verbose
Test: scan for Bluetooth devices, watch logcat
Change-Id: I971a7e56359adc39d006a1b10b5333c2f31ebaff
Hansong Zhang [Mon, 24 Jun 2019 23:40:15 +0000 (16:40 -0700)]
Rootcanal: Fix check in RejectSlaveConnection am:
7770d4d644
am:
7fc8ceb04c
Change-Id: Icfd00ce77bb59ef2bb44496a3f8f4811d3aa15c0
Hansong Zhang [Mon, 24 Jun 2019 23:33:37 +0000 (16:33 -0700)]
Rootcanal: Fix check in RejectSlaveConnection
am:
7770d4d644
Change-Id: I290613d754267c5a4d97ee1d5562b39a1a6289a7
Hansong Zhang [Fri, 21 Jun 2019 20:53:33 +0000 (13:53 -0700)]
Rootcanal: Fix check in RejectSlaveConnection
Test: manual
Change-Id: Ic37c123f5326e2cf5675f2eeb1734eb9514d86bc
Venkata Jagadeesh Garaga [Fri, 21 Jun 2019 15:36:52 +0000 (08:36 -0700)]
GAP: Correct the continuous pkt length in l2cap am:
337bd45794
am:
fdcf9ea434
Change-Id: I2598596ff14b7f29d5373fd81e058a9046f5343f
Venkata Jagadeesh Garaga [Fri, 21 Jun 2019 15:09:57 +0000 (08:09 -0700)]
GAP: Correct the continuous pkt length in l2cap
am:
337bd45794
Change-Id: I15e184af5dc8b9873f0941f0188892c60fad7a44
Venkata Jagadeesh Garaga [Thu, 18 Apr 2019 11:43:49 +0000 (17:13 +0530)]
GAP: Correct the continuous pkt length in l2cap
L2cap continuous pkt length wrongly calculated in
reassembly logic when remote sends more data
than expected.
Wrong pkt length leading to memory corruption
Hence the Correct the continuous pkt length in
l2cap reassembly logic.
Change-Id: I758d9e31465b99e436b9b1841320000f08186c97
CRs-Fixed:
2434229
Bug:
135239489
Hansong Zhang [Fri, 21 Jun 2019 00:34:45 +0000 (17:34 -0700)]
Rootcanal: detect HCI socket close am:
106fc60a97
am:
854003b693
Change-Id: Ic3e71542ddeaf6cfc7b881be1416d8c7293f0691
Hansong Zhang [Fri, 21 Jun 2019 00:24:38 +0000 (17:24 -0700)]
Rootcanal: detect HCI socket close
am:
106fc60a97
Change-Id: I42e1f7165abb47219510a1e4369f4c763076442a
Chris Manton [Thu, 20 Jun 2019 22:25:09 +0000 (15:25 -0700)]
Merge "Extend setup acts script with more helpful information on failure" am:
a91ca67ff5
am:
8c9415adff
Change-Id: I12365bc2f03045ddf166562601bdfb8c0d1aabdb
Hansong Zhang [Wed, 19 Jun 2019 23:53:15 +0000 (16:53 -0700)]
Rootcanal: detect HCI socket close
Test: manual
Change-Id: I609f917061e5d83e011edfeb61de281ff45b13e4
Chris Manton [Thu, 20 Jun 2019 21:44:43 +0000 (14:44 -0700)]
Merge "Extend setup acts script with more helpful information on failure"
am:
a91ca67ff5
Change-Id: I74ad4d04f113b8db1d91eff0d3d1f30a34e1f554
Chris Manton [Thu, 20 Jun 2019 18:22:04 +0000 (18:22 +0000)]
Merge "Extend setup acts script with more helpful information on failure"
Hansong Zhang [Thu, 20 Jun 2019 03:40:58 +0000 (20:40 -0700)]
HCI layer: Gracefully handle multiple incoming ACL am:
16fe385c93
am:
5ee1ca96d4
Change-Id: I68efc2e3a07c8f858acd72385f12b8f23e4f8e45
Hansong Zhang [Thu, 20 Jun 2019 03:38:28 +0000 (20:38 -0700)]
OS Queue: Add Enqueue Buffer am:
dd19906c7a
am:
c6e471fe43
Change-Id: Ib892ec21163312fc6d972094dd25f010ede234da
Hansong Zhang [Thu, 20 Jun 2019 03:18:56 +0000 (20:18 -0700)]
HCI layer: Gracefully handle multiple incoming ACL
am:
16fe385c93
Change-Id: I95b2a90da01324652a557b2e1cd665668632d13d
Hansong Zhang [Thu, 20 Jun 2019 03:18:36 +0000 (20:18 -0700)]
OS Queue: Add Enqueue Buffer
am:
dd19906c7a
Change-Id: Iae6f9b9e8b1dbb4704cd14d77b8e65349e45414c
Hansong Zhang [Thu, 20 Jun 2019 01:35:36 +0000 (18:35 -0700)]
HCI Controller: Read BD_ADDR am:
c443be7def
am:
17bb10e48d
Change-Id: I7bcda48dd86e795da3f83baee03985e85e677e17
Hansong Zhang [Thu, 20 Jun 2019 00:54:26 +0000 (17:54 -0700)]
HCI Controller: Read BD_ADDR
am:
c443be7def
Change-Id: I2492435142ce72080b029ea8bb724be8ab79352e
Hansong Zhang [Wed, 19 Jun 2019 18:21:37 +0000 (11:21 -0700)]
HCI layer: Gracefully handle multiple incoming ACL
Test: bluetooth_test_gd
Change-Id: Ieeaf9ba516f998d8c0bf13c5032cf231361e091d
Hansong Zhang [Wed, 19 Jun 2019 21:53:16 +0000 (14:53 -0700)]
OS Queue: Add Enqueue Buffer
Enqueue Buffer is a common interface to handle RegisterEnqueue() and
UnregisterEnqueue() according to current buffer size
Test: bluetooth_test_gd
Change-Id: I5b3ef749cd09f866a6c676af403ab6fa39d34701
Hansong Zhang [Tue, 18 Jun 2019 23:04:01 +0000 (16:04 -0700)]
HCI Controller: Read BD_ADDR
Stack needs to know BD_ADDR, when it reports its own address to facade
Test: bluetooth_test_gd
Change-Id: I77754bb89f3638a6b15a3037d0427754b439cdcf
Chris Manton [Wed, 19 Jun 2019 17:54:04 +0000 (10:54 -0700)]
Extend setup acts script with more helpful information on failure
Test: source ./setup_acts.sh
Change-Id: If04190a79a175d5f6f11c168286d6a48a64be9ea
Zhijun He [Wed, 19 Jun 2019 05:50:40 +0000 (22:50 -0700)]
Revert "libprocessgroup users use libcutils"
am:
0c4d5997a4
Change-Id: Ieebc74809073fee9e2540bc096724c7bdd3c2c58
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
Hansong Zhang [Wed, 19 Jun 2019 04:27:50 +0000 (21:27 -0700)]
HCI: ACL Manager am:
cf49fa97df
am:
b55c176eb2
Change-Id: I348c2eeff4712534f1d84e47e4545f9972f57314
Andre Eisenbach [Wed, 19 Jun 2019 03:31:23 +0000 (20:31 -0700)]
Limit sniff mode for Nintendo Pro Controller to 11.25ms
am:
85d56a8d38
Change-Id: I5551bccb471a9d6ea4fe0f1e117548c00387a7ac
Hansong Zhang [Wed, 19 Jun 2019 03:27:53 +0000 (20:27 -0700)]
HCI: ACL Manager
am:
cf49fa97df
Change-Id: I2ec5dc43d81d017f66fd9aa59bfaa0e5059035c4
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: Ida6394ee0ebcad35140005df796398eb03e22c51
Martin Brabham [Wed, 19 Jun 2019 03:24:45 +0000 (20:24 -0700)]
Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP"
am:
19d8c6e7c9
Change-Id: I3b0e1347f16e6a749a685f176b8b8631b32f9bbf
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:47 +0000 (16:48 -0700)]
libprocessgroup users use libcutils
am:
93e1622ba6
Change-Id: I130c95c0fc4f89ba1011801ec218dee3f421cfad
Andre Eisenbach [Tue, 18 Jun 2019 20:25:37 +0000 (13:25 -0700)]
Merge "Limit sniff mode for Nintendo Pro Controller to 11.25ms" am:
a2cbffedee
am:
96d94b2851
Change-Id: I5ee99ecf06a557b781038dede9e519fb84e451e5
Hansong Zhang [Tue, 7 May 2019 00:54:51 +0000 (17:54 -0700)]
HCI: ACL Manager
ACL manager is the interface for user layer (L2CAP) to manage connection
and send/receive data packets
Test: atest --host bluetooth_test_gd
Change-Id: I43aa5aabd2474aca5e0b4bae06a6cbfae56fd156
Andre Eisenbach [Tue, 18 Jun 2019 20:09:30 +0000 (13:09 -0700)]
Merge "Limit sniff mode for Nintendo Pro Controller to 11.25ms"
am:
a2cbffedee
Change-Id: I726e73381421f12c6d79a08adf5ceaf69bb92a82
Treehugger Robot [Tue, 18 Jun 2019 19:44:27 +0000 (19:44 +0000)]
Merge "Limit sniff mode for Nintendo Pro Controller to 11.25ms"
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
Jakub Pawlowski [Tue, 18 Jun 2019 16:26:07 +0000 (09:26 -0700)]
Fix coverage build am:
ec2a8028a5
am:
bf2b5e4cb6
Change-Id: If8d22a3676f977651577fe9594ad571c7b69baf4
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 [Tue, 18 Jun 2019 16:11:56 +0000 (09:11 -0700)]
Fix coverage build
am:
ec2a8028a5
Change-Id: I26c957ef7d1960e3b053939b2d07258515d625cf
Jakub Pawlowski [Tue, 18 Jun 2019 12:50:07 +0000 (14:50 +0200)]
Fix coverage build
Bug:
135496567
Change-Id: I0de650ce2987926098577e7ab690c0bd9409e39a
Hansong Zhang [Mon, 17 Jun 2019 21:53:14 +0000 (14:53 -0700)]
Stack manager: Clear handler during ShutDown() am:
0bce6f7479
am:
0d8c6e7568
Change-Id: I5d586c2738607968607234f7c06a1e7de1da22cc
Hansong Zhang [Mon, 17 Jun 2019 21:39:31 +0000 (14:39 -0700)]
Stack manager: Clear handler during ShutDown()
am:
0bce6f7479
Change-Id: I2b332437d132adc3b08975ad30186978b0611811
Hansong Zhang [Fri, 14 Jun 2019 01:31:40 +0000 (18:31 -0700)]
Stack manager: Clear handler during ShutDown()
* Clear StackManager.handler_ before it is deleted
* Use local variable promise in StartUp and ShutDown
* Add unit test
Test: bluetooth_test_gd
Change-Id: I0a6de64c5f159fdf4c97c123aa3fa2f37b2b7e34
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