OSDN Git Service
Andre Eisenbach [Wed, 19 Jun 2019 04:16:08 +0000 (21:16 -0700)]
Limit sniff mode for Nintendo Pro Controller to 11.25ms am:
85d56a8d38
am:
0b7eb3443f
Change-Id: Iab1b1038dd0de11a6f53e3cefd180dbfb1540f49
Martin Brabham [Wed, 19 Jun 2019 04:15:34 +0000 (21:15 -0700)]
Merge "Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP"" into qt-dev am:
1d0646a396
am:
bf0a90a1f8
Change-Id: I757e61b53bd6b0ee374722870c8dbb52323ecc17
Martin Brabham [Wed, 19 Jun 2019 04:12:40 +0000 (21:12 -0700)]
Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" am:
19d8c6e7c9
am:
e44bcc7972
Change-Id: Ie1dc9d488a697810ad8eff94fc4cd162acc78673
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
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 [Wed, 19 Jun 2019 00:21:04 +0000 (17:21 -0700)]
libprocessgroup users use libcutils am:
93e1622ba6
am:
a954ddc44e
Change-Id: If1e012c7a437216e4e2d803e8cefcbe2eed5a42d
Steven Moreland [Wed, 19 Jun 2019 00:17:25 +0000 (17:17 -0700)]
libprocessgroup users use libcutils am:
93e1622ba6
am:
01358b65d1
Change-Id: I430d4b13e800c12e2c339ee36b60032b74a18a92
Steven Moreland [Tue, 18 Jun 2019 23:48:59 +0000 (16:48 -0700)]
libprocessgroup users use libcutils
am:
93e1622ba6
Change-Id: Ia39a50ffff1c8d9011df0f1fb9f399940c8e4b88
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 21:21:35 +0000 (14:21 -0700)]
Merge "Limit sniff mode for Nintendo Pro Controller to 11.25ms" am:
a2cbffedee am:
96d94b2851
am:
bc5720d30f
Change-Id: I3aa0bb5cdda586630ecfef39b42f448139792198
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
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:38:06 +0000 (09:38 -0700)]
Fix coverage build am:
ec2a8028a5 am:
bf2b5e4cb6
am:
75f4636c1e
Change-Id: I5cd1d5e1702fc25c722ba7f7d19669ba4c0c83c3
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 22:07:07 +0000 (15:07 -0700)]
Stack manager: Clear handler during ShutDown() am:
0bce6f7479 am:
0d8c6e7568
am:
212486683c
Change-Id: I7f461acca818a8dc7b65cb9a6782bdaec6d0fad0
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 [Mon, 17 Jun 2019 18:33:42 +0000 (11:33 -0700)]
Improve blocking queue am:
5453d12fa2 am:
fdec3d59a3
am:
84db781c82
Change-Id: I0b0a8d1baa15d21c142d39bc90c1be054afe24ab
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:24:20 +0000 (00:24 -0700)]
PDL: Make GetPayload() const am:
cc278448fc am:
9845dd3552
am:
a6e2cb910f
Change-Id: I2038484f001c4a589c2d8c82644dd048fc9b7c2e
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:44:20 +0000 (21:44 -0700)]
HAL: Add unregisterIncomingPacketCallback am:
13856b239a am:
04657e6030
am:
732cca535f
Change-Id: If956599120b09bdc1d9147562ba1d0e38f706340
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
Android Build Merger (Role) [Thu, 13 Jun 2019 22:55:03 +0000 (22:55 +0000)]
Merge "[automerger skipped] Fix for BluetoothGattCallback.onConnectionStateChange being called more than once am:
981864174e -s ours am:
6ef3858af4 -s ours am skip reason: change_id Id94db9429e31224ef35eb2c99c0f9a65e7c27d32 with SHA1
f00142a4dc is in history" into qt-r1-dev-plus-aosp
Jakub Pawlowski [Thu, 13 Jun 2019 22:54:48 +0000 (15:54 -0700)]
[automerger skipped] Fix for BluetoothGattCallback.onConnectionStateChange being called more than once am:
981864174e -s ours
am:
6ef3858af4 -s ours
am skip reason: change_id Id94db9429e31224ef35eb2c99c0f9a65e7c27d32 with SHA1
f00142a4dc is in history
Change-Id: I155886b3672ee6f752ee49a0b5a01a5d7eef0449
Jakub Pawlowski [Thu, 13 Jun 2019 22:54:40 +0000 (15:54 -0700)]
[automerger skipped] Fix for BluetoothGattCallback.onConnectionStateChange being called more than once am:
981864174e
am:
03306c5098 -s ours
am skip reason: change_id Id94db9429e31224ef35eb2c99c0f9a65e7c27d32 with SHA1
f00142a4dc is in history
Change-Id: Iab868cd7c2fe283914eb98321fe0435e76750d28
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 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:41:18 +0000 (15:41 -0700)]
HCI: Add a controller for properties and credits am:
b79d5ead27 am:
fb60b2b8f7
am:
1c8caa45b8
Change-Id: Ifafc5288a00e082b2759ec89eebbc01a228b76b0
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 21:07:31 +0000 (14:07 -0700)]
Merge "HCI: HCI command credit and timeout handling" am:
72c660d28c am:
5e164adfe6
am:
196d8588ad
Change-Id: I88633fc06c19e2ac01dd729a79ed1149901abe10
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 20:09:59 +0000 (13:09 -0700)]
Fix for BluetoothGattCallback.onConnectionStateChange being called more than once am:
f00142a4dc am:
0a8b7ef782
am:
db90d25fcc
Change-Id: Ia74511b4f5b492ac6bcf658060f01bae742bae0b
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:58:44 +0000 (18:58 -0700)]
HCI layer: Synchronize API with handler am:
4564dc3a11 am:
96074b7879
am:
2021585bed
Change-Id: Iea861e0e46e95dff003b5d3347f0423466d246e6
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 01:02:03 +0000 (18:02 -0700)]
Replace std::function with base::Closure am:
aa0875c122 am:
29c6d79266
am:
b4140ee505
Change-Id: Id04ede18aaa2b46e75fdce5440152c500d1c61d4
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:12:58 +0000 (17:12 -0700)]
OS: Add ordering guarantees for Handler.Clear() am:
742fe6dbd1 am:
df0c6b1bac
am:
d3a35ad1e0
Change-Id: Ie8d9bb4278fe1445568e6901a6df9b2f65abcffa
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:48:31 +0000 (15:48 -0700)]
OS: Add Reactor::WaitForUnregisteredReactable() am:
a69e704b89 am:
f4ee85bb38
am:
66639a69b7
Change-Id: I298d6c6409407749394a568f939287c995409794
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:43:59 +0000 (09:43 -0700)]
[automerger skipped] Load gatt_database if it is empty in bta_gattc_process_indicate am:
d8cdc6c2b8
am:
94b4587208 -s ours
am skip reason: change_id Id3f3f0f33d5e0469a6f2ac6612fa9f5ea0b24142 with SHA1
d8cdc6c2b8 is in history
Change-Id: I84acc7fc1cdf3d2d419c2af53131bea2bdbe6c65
weichinweng [Wed, 12 Jun 2019 16:34:24 +0000 (09:34 -0700)]
[automerger skipped] Load gatt_database if it is empty in bta_gattc_process_indicate am:
d8cdc6c2b8 -s ours
am:
20e4310319 -s ours
am skip reason: change_id Id3f3f0f33d5e0469a6f2ac6612fa9f5ea0b24142 with SHA1
9a169893a8 is in history
Change-Id: Iffde9fa26fd1597ddaca561b0818c8f9cdb412cb
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 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 [Wed, 12 Jun 2019 07:54:00 +0000 (00:54 -0700)]
Load gatt_database if it is empty in bta_gattc_process_indicate am:
9a169893a8 am:
f9b7dfff77
am:
0f2f9e301c
Change-Id: I31d67fc3c52ddc35fc2b8d240fc0af7670a82e84
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:13:51 +0000 (15:13 -0700)]
Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate" am:
1ae89b7db2
am:
529cecd2d8
Change-Id: I830b783e743ac2201e2c046b8b8cab83c5e08aa7
Jakub Pawlowski [Tue, 11 Jun 2019 22:08:20 +0000 (15:08 -0700)]
Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate" am:
1ae89b7db2
am:
e05ea5ed11
Change-Id: Id7bd8ee1fb0492e137525f78c3202d1cd5197e96
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 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 18:47:03 +0000 (11:47 -0700)]
Merge "Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate"" am:
103addf9f7 am:
288ba569ff
am:
bc8637d9d0
Change-Id: I291fd125f79c4a5935445e6bb1864f8a68815bba
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:22:30 +0000 (18:22 -0700)]
OS: Update Handler unittest am:
6a3d2769e5 am:
06a6e601f3
am:
94bec5ac69
Change-Id: I705480c9958faebb9e2fea0744a84a4fc97034f6
Myles Watson [Tue, 11 Jun 2019 01:22:25 +0000 (18:22 -0700)]
OS: Don't hold the lock while the callback runs am:
5831f4165c am:
5f46294fc0
am:
686d8189a8
Change-Id: I723b1fb609a808b0786dcdadcdd906af5c83108b
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
The Android Open Source Project [Mon, 10 Jun 2019 20:30:04 +0000 (13:30 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am:
5cf6a28c88 -s ours am:
f2402e7b26 -s ours
am:
577f29b3ba
Change-Id: I5958b12b95aa3023ae435f21ca8cc67d447eb26b
OSDN Git Service
