OSDN Git Service
Andre Eisenbach [Tue, 30 May 2017 21:14:55 +0000 (21:14 +0000)]
Merge "DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb" into cw-f-dev am:
b044bae800 -s ours am:
310ce8b220 -s ours
am:
1917615840 -s ours
Change-Id: I91ce7e6383929bec27e0acc2d9544e6478495f22
Andre Eisenbach [Tue, 30 May 2017 21:10:55 +0000 (21:10 +0000)]
Merge "DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb" into cw-f-dev am:
b044bae800 -s ours
am:
310ce8b220 -s ours
Change-Id: Ic13bec3228eebc49d2cf82ecc6f2eee4156a31ef
Andre Eisenbach [Tue, 30 May 2017 21:06:25 +0000 (21:06 +0000)]
Merge "DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb" into cw-f-dev
am:
b044bae800 -s ours
Change-Id: Ic7314f6710c10c670ea3a4a24b4865661ee1451e
TreeHugger Robot [Tue, 30 May 2017 21:00:28 +0000 (21:00 +0000)]
Merge "DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb" into cw-f-dev
Andre Eisenbach [Thu, 3 Nov 2016 21:53:49 +0000 (14:53 -0700)]
DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb
|data| may be NULL if the RSSI request times out.
See btm_read_rssi_timeout implementation for details.
Bug:
32587130
Test: manual
Change-Id: Ide9dee819e1db24a39c05b086cd4c0b558ca23ef
Jack He [Sat, 27 May 2017 02:07:21 +0000 (02:07 +0000)]
Merge "HSP: Use peer_version during SCO setup" am:
5519f0d619 am:
f941095d46
am:
0b4b111030
Change-Id: Ied16a4e7ec67ae36f326b75a16adbccb003a94f9
Jack He [Sat, 27 May 2017 02:04:49 +0000 (02:04 +0000)]
Merge "HSP: Use peer_version during SCO setup" am:
5519f0d619
am:
f941095d46
Change-Id: Iacc5db4f2fd1e24e279af8cbbc80b3a7a06458b9
Jack He [Sat, 27 May 2017 02:02:19 +0000 (02:02 +0000)]
Merge "HSP: Use peer_version during SCO setup"
am:
5519f0d619
Change-Id: Ifd0d25560888922dfd6ae31a5ce2e51e3ace6899
Treehugger Robot [Sat, 27 May 2017 01:58:34 +0000 (01:58 +0000)]
Merge "HSP: Use peer_version during SCO setup"
Jakub Pawlowski [Sat, 27 May 2017 01:00:15 +0000 (01:00 +0000)]
Merge changes I0f43061b,I48c18401,I5073e800,I2c0926c7,I73120878 am:
10ef0e8527 am:
64b6a9c12c
am:
84d64d0d7b
Change-Id: I76d4d2f75ead66e9fe79add732166be9ca6169b6
Jakub Pawlowski [Sat, 27 May 2017 00:57:45 +0000 (00:57 +0000)]
Merge changes I0f43061b,I48c18401,I5073e800,I2c0926c7,I73120878 am:
10ef0e8527
am:
64b6a9c12c
Change-Id: I53f08acb54e483d1e943c1ba4868fc45dceab1f8
Jakub Pawlowski [Sat, 27 May 2017 00:55:17 +0000 (00:55 +0000)]
Merge changes I0f43061b,I48c18401,I5073e800,I2c0926c7,I73120878
am:
10ef0e8527
Change-Id: I19412f34ab531f4c38fc1c32686bbcaabb25cfe9
Treehugger Robot [Sat, 27 May 2017 00:50:22 +0000 (00:50 +0000)]
Merge changes I0f43061b,I48c18401,I5073e800,I2c0926c7,I73120878
* changes:
Get rid of AMP_INCLUDED
Get rid of GAP control block
Get rid of GAP_TRACE_* logs
Get rid of GAP_CONN_INCLUDED
BLE GAP simplification
Myles Watson [Fri, 26 May 2017 23:25:45 +0000 (23:25 +0000)]
GATT: Interop fix for service changed indications am:
43c7f9f477 am:
fb071c4783
am:
07c773e95d
Change-Id: I42ce7a473e0c53e69660fbdb9e409d18e1131e76
Myles Watson [Fri, 26 May 2017 23:18:54 +0000 (23:18 +0000)]
GATT: Interop fix for service changed indications am:
43c7f9f477
am:
fb071c4783
Change-Id: Icc33cdab9468411b415f5265659198c4b8c28384
Jakub Pawlowski [Fri, 26 May 2017 22:54:23 +0000 (15:54 -0700)]
Get rid of AMP_INCLUDED
Change-Id: I0f43061b150cfc61bb31cfc7a580592454cfbf9f
Jakub Pawlowski [Fri, 26 May 2017 22:49:07 +0000 (15:49 -0700)]
Get rid of GAP control block
Instead of global GAP control block, use separate block for gap_conn.cc
and gap_ble.cc
Change-Id: I48c18401390300f80285ba5491e8d91ee63d55ef
Jakub Pawlowski [Fri, 26 May 2017 22:16:15 +0000 (15:16 -0700)]
Get rid of GAP_TRACE_* logs
This is a step required for making GAP testable, and not dependent on
any global log structures.
Change-Id: I5073e800cf842864021328308feb59a409927b2b
Myles Watson [Fri, 26 May 2017 23:14:13 +0000 (23:14 +0000)]
GATT: Interop fix for service changed indications
am:
43c7f9f477
Change-Id: Ie6017226118fa60f5d05034a2e04a4dcbd31828a
Myles Watson [Fri, 26 May 2017 00:24:49 +0000 (17:24 -0700)]
GATT: Interop fix for service changed indications
The Pixel C Keyboard disconnects if it receives an indication
for which it hasn't registered.
Test: Add a GATT service with Pixel C connected
Bug:
34352677
Change-Id: I1f717db40b2ba9ec21feac5fd9e339c09f140d51
Jakub Pawlowski [Fri, 26 May 2017 21:36:51 +0000 (14:36 -0700)]
Get rid of GAP_CONN_INCLUDED
Change-Id: I2c0926c7c935b6efe1f0ea35a86ed89edb746096
Jakub Pawlowski [Thu, 25 May 2017 16:05:23 +0000 (09:05 -0700)]
BLE GAP simplification
Test: manual
Change-Id: I73120878aadf41e54f8eb1aae75e9f9bbb1df942
Jack He [Tue, 23 May 2017 02:23:04 +0000 (19:23 -0700)]
HSP: Use peer_version during SCO setup
* HSP profile should use peer_version obtained through SDP search to
determine its behavior during SCO setup instead of a local version
during initialization
* Added a WARNING message if SDP search failed to get remote HSP
version, the default behavior is to use HSP 1.0
* Changed SDP search initialization to look for one UUID at a time
* See Bluetooth Erratum 3507
Test: make, HSP PTS test
Bug:
38210042
Change-Id: I67ce615a785b25a2e9304613a29d9be66a656c54
Jakub Pawlowski [Fri, 26 May 2017 19:23:50 +0000 (19:23 +0000)]
Remove dead code from GAP am:
bd40666323 am:
af43d92665
am:
b2d70eb00f
Change-Id: I42b0aa2f28bd19e7d5003ab985a61f8d509035ce
Jakub Pawlowski [Fri, 26 May 2017 19:21:51 +0000 (19:21 +0000)]
Remove dead code from GAP am:
bd40666323
am:
af43d92665
Change-Id: I38006520ff90630b114419eeb82a662122772ff2
Jakub Pawlowski [Fri, 26 May 2017 19:19:51 +0000 (19:19 +0000)]
Remove dead code from GAP
am:
bd40666323
Change-Id: If144088be038a51592f8013373db1c96d40f5e02
Jakub Pawlowski [Fri, 26 May 2017 17:38:28 +0000 (17:38 +0000)]
Merge "Fix crashes when GAP operation is interrupted by disconnection" into oc-dev
am:
de75b705a2
Change-Id: Ied9fbf4102e59c823197c08b28e3e86b41755140
Jakub Pawlowski [Fri, 26 May 2017 17:38:13 +0000 (17:38 +0000)]
Fix GATT Server disconnecting for no reason
am:
ce54c40320
Change-Id: Ibe98ea2c93a6ce153d7d8a7458078248faba0a58
TreeHugger Robot [Fri, 26 May 2017 17:34:54 +0000 (17:34 +0000)]
Merge "Fix crashes when GAP operation is interrupted by disconnection" into oc-dev
Jakub Pawlowski [Fri, 26 May 2017 17:25:02 +0000 (10:25 -0700)]
Remove dead code from GAP
Test: none
Change-Id: I23badbf73420e4af26e6d84f7b04fcd56100b122
Jakub Pawlowski [Thu, 25 May 2017 16:09:12 +0000 (09:09 -0700)]
Fix GATT Server disconnecting for no reason
Connections created by GAP profile should be ephemeral, and not
interfere with the connection timeout.
When a device is bonded, listing services through DM would cause a
DM APP to create a connection, and later to disconnect. This causes
connection to timeout. In case a device was already connected, this
should not happen.
Bug:
34951749
Test: manual
Change-Id: Iad04fd9eed4c664f35131442e3f83a704497a067
(cherry picked from commit
16bb48b320cde54a1a06a525f4d9be1421689649)
Jakub Pawlowski [Thu, 25 May 2017 15:21:53 +0000 (08:21 -0700)]
Fix crashes when GAP operation is interrupted by disconnection
Also fixes potential issue while allocating control blocks.
Test: none
Bug:
38499153
Change-Id: I5101ac97476953cdfece45c3fa9b909e38b9d2dd
(cherry picked from commit
feec106412c54dbbfdb0e13d62d744f8fec6fd52)
Jack He [Thu, 25 May 2017 23:15:39 +0000 (23:15 +0000)]
MCAP: Add test interface for PTS test (2/2)
am:
04442a41e9
Change-Id: Ibb4be7e7e0b6be1f957445c5488242ae076eda0d
Jack He [Thu, 25 May 2017 22:48:56 +0000 (22:48 +0000)]
Merge "MCAP: Add a test tool for MCAP" am:
70e0eada0b am:
d2cb086e1b
am:
d5f149de27
Change-Id: Ic48246e50084b92e475fef337ef7398679c27220
Jack He [Thu, 25 May 2017 22:43:57 +0000 (22:43 +0000)]
Merge "MCAP: Add a test tool for MCAP" am:
70e0eada0b
am:
d2cb086e1b
Change-Id: Ifb6fa1a21bd30e00ea1616beec113601954ac17f
Jakub Pawlowski [Thu, 25 May 2017 22:39:33 +0000 (22:39 +0000)]
Fix GATT Server disconnecting for no reason am:
16bb48b320 am:
5fc17ef4b7
am:
ca082955cb
Change-Id: I90b37ec82dec17676a475631ddc4c551e503a839
Jack He [Thu, 25 May 2017 22:39:27 +0000 (22:39 +0000)]
Merge "MCAP: Add a test tool for MCAP"
am:
70e0eada0b
Change-Id: Idcd521156ce5fb4a087abcde02eaac92cd36c876
Jakub Pawlowski [Thu, 25 May 2017 22:39:27 +0000 (22:39 +0000)]
Revert "Fix GATT Server disconnecting for no reason" am:
63e8f19255 am:
5ba92b64da
am:
afe64ccf2e
Change-Id: Ib50bc8d7de4a74c601c0e75c4fe288b45c55b8cc
Jakub Pawlowski [Thu, 25 May 2017 22:34:58 +0000 (22:34 +0000)]
Fix GATT Server disconnecting for no reason am:
16bb48b320
am:
5fc17ef4b7
Change-Id: I4f2acc6268bd24e689d727cd97300e0ece66c732
Jakub Pawlowski [Thu, 25 May 2017 22:34:55 +0000 (22:34 +0000)]
Revert "Fix GATT Server disconnecting for no reason" am:
63e8f19255
am:
5ba92b64da
Change-Id: Ibb34c34a67623fba589a9e2a2599b00011c8d487
Treehugger Robot [Thu, 25 May 2017 22:32:19 +0000 (22:32 +0000)]
Merge "MCAP: Add a test tool for MCAP"
Jakub Pawlowski [Thu, 25 May 2017 22:30:29 +0000 (22:30 +0000)]
Fix GATT Server disconnecting for no reason
am:
16bb48b320
Change-Id: I6c511d6825620e87503fce76f7c70114f8fd87fc
Jakub Pawlowski [Thu, 25 May 2017 22:30:26 +0000 (22:30 +0000)]
Revert "Fix GATT Server disconnecting for no reason"
am:
63e8f19255
Change-Id: I6e717171f346ce5d7331f8ea13821e6b54bdb5d6
Jakub Pawlowski [Thu, 25 May 2017 21:27:39 +0000 (21:27 +0000)]
Fix crashes when GAP operation is interrupted by disconnection am:
feec106412 am:
99664212c1
am:
83466c0e38
Change-Id: I8e809b78a471b2ec98f08a8d3e8cf457f83d5fb2
Jakub Pawlowski [Thu, 25 May 2017 21:22:39 +0000 (21:22 +0000)]
Fix crashes when GAP operation is interrupted by disconnection am:
feec106412
am:
99664212c1
Change-Id: Iede38cf945d63498158f7967eac3c20b8b4e331b
Jakub Pawlowski [Thu, 25 May 2017 21:18:09 +0000 (21:18 +0000)]
Fix crashes when GAP operation is interrupted by disconnection
am:
feec106412
Change-Id: I3e714e751e0110cbff1ad6459e5e51b1cd324e56
Jakub Pawlowski [Thu, 25 May 2017 16:09:12 +0000 (09:09 -0700)]
Fix GATT Server disconnecting for no reason
Connections created by GAP profile should be ephemeral, and not
interfere with the connection timeout.
When a device is bonded, listing services through DM would cause a
DM APP to create a connection, and later to disconnect. This causes
connection to timeout. In case a device was already connected, this
should not happen.
Bug:
34951749
Test: manual
Change-Id: Iad04fd9eed4c664f35131442e3f83a704497a067
Jakub Pawlowski [Thu, 25 May 2017 20:24:28 +0000 (13:24 -0700)]
Revert "Fix GATT Server disconnecting for no reason"
This reverts commit
b69edd55ffe953d4f71f4a948e3feb2243223980.
Jack He [Thu, 18 May 2017 05:26:05 +0000 (22:26 -0700)]
MCAP: Add a test tool for MCAP
* Add a command line tool for MCAP related tests
* This tool can access the Bluetooth stack via a command line program
* Type "help" to obtain a list of available console commands in this
Bluetooth
* Bluetooth must be disabled when this tool is running
Bug:
37867299
Test: make, PTS MCAP test
Change-Id: I106e6625ee8a29b7fdad88cdfeb99419054ef771
Jakub Pawlowski [Thu, 25 May 2017 15:21:53 +0000 (08:21 -0700)]
Fix crashes when GAP operation is interrupted by disconnection
Also fixes potential issue while allocating control blocks.
Test: none
Bug:
38499153
Change-Id: I5101ac97476953cdfece45c3fa9b909e38b9d2dd
Jakub Pawlowski [Thu, 25 May 2017 14:29:24 +0000 (14:29 +0000)]
Fix GATT Server disconnecting for no reason am:
b69edd55ff am:
96c6be22d9
am:
13b562a161
Change-Id: I60718b6a9fe94bf954623e53fc44cbd596d9771e
Jakub Pawlowski [Thu, 25 May 2017 14:25:23 +0000 (14:25 +0000)]
Fix GATT Server disconnecting for no reason am:
b69edd55ff
am:
96c6be22d9
Change-Id: I21a5025712598779f7d0501031aa7bf4690fd853
Jakub Pawlowski [Thu, 25 May 2017 14:21:53 +0000 (14:21 +0000)]
Fix GATT Server disconnecting for no reason
am:
b69edd55ff
Change-Id: I02d9ded4520eabb317b85a5a10888e9432c991cf
Jakub Pawlowski [Wed, 24 May 2017 23:15:21 +0000 (16:15 -0700)]
Fix GATT Server disconnecting for no reason
When two devices are bonded, even if the device is supposed to act just
as a GATT Server, service discovery is performed. Doing "read by type"
should not trigger connection timeout, or disconnection, as the server
should wait for the client to finish connection.
Please note that it does not GATT Client behaviour, as they manage the
connection timeout through L2CA_SendFixedChnlData called on each data
packet.
Bug:
34951749
Test: manual
Change-Id: If53cf63dc204238a60839497992c870b1b39aa60
Jack He [Sat, 13 May 2017 20:52:12 +0000 (13:52 -0700)]
MCAP: Add test interface for PTS test (2/2)
* PTS tests requires MCAP APIs to be called at protocol level
* This CL creates a test interface to enable the above functionality
Bug:
37867299
Test: make, no user visible effect
Change-Id: I15cc6cc613ce8f7c57564296e45077ab877c269b
(cherry picked from commit
722ce12babbd3d1e814f6e704860699a0b726e4f)
Jack He [Wed, 24 May 2017 20:48:22 +0000 (20:48 +0000)]
MCAP: Add test interface for PTS test (2/2) am:
722ce12bab am:
445f930bc8
am:
3ca7ae5d93
Change-Id: I1b1d1a9824a0bf6bf4ed8ac373f21bbe73a8f44e
Jack He [Wed, 24 May 2017 20:45:47 +0000 (20:45 +0000)]
MCAP: Add test interface for PTS test (2/2) am:
722ce12bab
am:
445f930bc8
Change-Id: If205315f7e2dde0fd2bd99fb03793d5159399a1f
Jack He [Wed, 24 May 2017 20:42:46 +0000 (20:42 +0000)]
MCAP: Add test interface for PTS test (2/2)
am:
722ce12bab
Change-Id: Idf202cccd67609408beb0f7ca7b98b75b914abf8
Jack He [Wed, 24 May 2017 17:50:16 +0000 (17:50 +0000)]
MCAP: Fix bugs in MCAP stack
am:
0f54d697b7
Change-Id: Ib8192ca8dee9e00f2190c1f3eda1ca7c76bfd055
Jack He [Thu, 18 May 2017 05:22:18 +0000 (22:22 -0700)]
MCAP: Fix bugs in MCAP stack
* Fix error response message for clock sync opcodes
* Fix error response message for CREATE_MDL opcode
* Fix logging in the MCAP stack
Bug:
37867299
Test: make, PTS MCAP test
Change-Id: I7a37ac04806bca20d732357f00b4761577b4be19
(cherry picked from commit
b3a8dc2ece90770b41f4bc0555fabb2742093176)
Jack He [Wed, 24 May 2017 00:52:30 +0000 (00:52 +0000)]
eSCO: Format changes to original vendor patch (4/5)
am:
a43e1304c2
Change-Id: Idba6f8de605855aa29029ba0d110c43e47cf192a
Jack He [Wed, 24 May 2017 00:52:27 +0000 (00:52 +0000)]
eSCO: Additional fix to get eSCO working for HFP and HSP (3/5)
am:
a9152a2892
Change-Id: Ib55cde122d419a0e6c295d86bf44aa9a37fc41d3
Myles Watson [Wed, 24 May 2017 00:52:24 +0000 (00:52 +0000)]
eSCO: Remove BTM_WBS_INCLUDED from the stack (2/5)
am:
5b9aaac278 -s ours
Change-Id: Ic6b01448a10d59905aefb696123e3c30c98b99df
Mudumba Ananth [Wed, 24 May 2017 00:52:21 +0000 (00:52 +0000)]
eSCO: BT 4.1 Enhanced SCO command (1/5)
am:
181863e6c2 -s ours
Change-Id: Ifc5c70990697fdcedc2ff070f7e7d35e939512f0
Jack He [Sat, 13 May 2017 20:52:12 +0000 (13:52 -0700)]
MCAP: Add test interface for PTS test (2/2)
* PTS tests requires MCAP APIs to be called at protocol level
* This CL creates a test interface to enable the above functionality
Bug:
37867299
Test: make, no user visible effect
Change-Id: I15cc6cc613ce8f7c57564296e45077ab877c269b
Jack He [Tue, 23 May 2017 22:55:59 +0000 (22:55 +0000)]
MCAP: Fix bugs in MCAP stack am:
b3a8dc2ece am:
76c828952b
am:
072b2734e4
Change-Id: Ic269878b285252c81cf0fb4d572497378805bc38
Jack He [Tue, 23 May 2017 22:53:34 +0000 (22:53 +0000)]
MCAP: Fix bugs in MCAP stack am:
b3a8dc2ece
am:
76c828952b
Change-Id: I82124c3cba4009b4f33d2188afd31e67cd6b98d8
Jack He [Tue, 23 May 2017 22:50:39 +0000 (22:50 +0000)]
MCAP: Fix bugs in MCAP stack
am:
b3a8dc2ece
Change-Id: I325234385a1b27cfdef45a785b09880b56570f93
Jack He [Thu, 18 May 2017 05:22:18 +0000 (22:22 -0700)]
MCAP: Fix bugs in MCAP stack
* Fix error response message for clock sync opcodes
* Fix error response message for CREATE_MDL opcode
* Fix logging in the MCAP stack
Bug:
37867299
Test: make, PTS MCAP test
Change-Id: I7a37ac04806bca20d732357f00b4761577b4be19
Jack He [Mon, 8 May 2017 00:27:47 +0000 (17:27 -0700)]
eSCO: Format changes to original vendor patch (4/5)
* Format changes to original vendor patch
* Re-order part of SCO creation code to improve readability
* Make log more concise and usefull
Bug:
19540029
Test: make, HFP PTS test, testplans/86884, testplans/87103
Change-Id: Ie0199519afb30f56568c04fef728fce44a172063
(cherry picked from commit
fe695a557a92053d4c44428ba08c0b8e945d4711)
Jack He [Mon, 8 May 2017 00:26:02 +0000 (17:26 -0700)]
eSCO: Additional fix to get eSCO working for HFP and HSP (3/5)
* Removed vendor specific call after codec negotiation and before eSCO
command is sent to Bluetooth chip
* Removed vendor specific call after a SCO connection is requested by
the peer
* Removed vendor specific save audio state methods
Bug:
19540029
Test: make, HFP PTS test, testplans/86884, testplans/87103
Change-Id: I899405a8eaa2f38ee0de04949c5288f9eefa74df
(cherry picked from commit
400ac497f45181d3c64f6a19687992de9b69b094)
Myles Watson [Fri, 10 Feb 2017 00:26:34 +0000 (16:26 -0800)]
eSCO: Remove BTM_WBS_INCLUDED from the stack (2/5)
All of our platforms support WBS.
Bug:
19540029
Test: make, HFP PTS test, testplans/86884, testplans/87103
Change-Id: I384d49f73935ebb35b17132e71c85174797c435e
(cherry picked from commit
3e634d6c1e83f053005c9abdbd89e662ad81c4d4)
Mudumba Ananth [Thu, 9 Feb 2017 17:05:48 +0000 (09:05 -0800)]
eSCO: BT 4.1 Enhanced SCO command (1/5)
Added support for BT 4.1 enhanced SCO feature on the stack.
This feature allows the stack to create a SCO connection with
remote device by using Hci_Enhanced_Setup_Synchronous_Connection
command after checking the controller (4.1) support for
enhanced SCO command.
Added the command parameters to use the command in both wide band
speech(WBS) and narrow band speech(NBS) scenarios.
Number of Broadcom vendor specific commands(VSCs)that are needed
to be sent to Broadcom controllers along with this command have
also been updated accordingly
NOTE: This change would also need a firmware patch for
the feature to work on Broadcom contollers which will
be delivered to Google in a separate change set.
Bug:
19540029
Test: make, HFP PTS test, testplans/86884, testplans/87103
Change-Id: I1014d81be5cbe91078a4484dd072ac3957bfdfe4
(cherry picked from commit
57f6508cf7b22788fa2e7a739cec241b785718fb)
Ajay Panicker [Mon, 22 May 2017 23:13:41 +0000 (23:13 +0000)]
Merge "Remove logspam when initializing logging for Bluetooth" into oc-dev
am:
844269f438
Change-Id: Ia05bfd0fa7238dbad6b1c50edc4661fed36c3bad
Ajay Panicker [Mon, 22 May 2017 23:13:28 +0000 (23:13 +0000)]
Remove logspam when adding GATT attributes
am:
c2f4110f06
Change-Id: I186f6dc27a765ddda24af6a8c2a8b2a7c1cf7db7
TreeHugger Robot [Mon, 22 May 2017 22:54:35 +0000 (22:54 +0000)]
Merge "Remove logspam when initializing logging for Bluetooth" into oc-dev
Ajay Panicker [Mon, 22 May 2017 22:19:56 +0000 (22:19 +0000)]
Merge "Remove logspam when initializing logging for Bluetooth" am:
0e3621da9f am:
040a8c6a4e
am:
1e70701ee3
Change-Id: Ibadfa81f47b132a0beabf2fc31b7b8cc4aa8a6f0
Ajay Panicker [Mon, 22 May 2017 22:11:57 +0000 (22:11 +0000)]
Remove logspam when adding GATT attributes am:
60177e01c4 am:
0c68aa7656
am:
4be48fe38a
Change-Id: If5881fae94c5bc8df2160d2cab1bd34c02773bf5
Ajay Panicker [Mon, 22 May 2017 22:11:56 +0000 (22:11 +0000)]
Merge "Remove logspam when initializing logging for Bluetooth" am:
0e3621da9f
am:
040a8c6a4e
Change-Id: I8df73a5791ad79c9111d350efd6d38b9b20b9377
Ajay Panicker [Mon, 22 May 2017 22:03:56 +0000 (22:03 +0000)]
Merge "Remove logspam when initializing logging for Bluetooth"
am:
0e3621da9f
Change-Id: I37043759504c279eb9063df8dddfa35762843462
Ajay Panicker [Mon, 22 May 2017 22:03:56 +0000 (22:03 +0000)]
Remove logspam when adding GATT attributes am:
60177e01c4
am:
0c68aa7656
Change-Id: Iec79072ff63213b76330187af93e171beca133a8
Ajay Panicker [Mon, 22 May 2017 21:57:58 +0000 (21:57 +0000)]
Remove logspam when adding GATT attributes
am:
60177e01c4
Change-Id: I1f740dbf89ae5a2888a053d31d37d292748872e7
Treehugger Robot [Mon, 22 May 2017 21:55:19 +0000 (21:55 +0000)]
Merge "Remove logspam when initializing logging for Bluetooth"
Ajay Panicker [Wed, 17 May 2017 05:43:51 +0000 (22:43 -0700)]
Remove logspam when initializing logging for Bluetooth
Bug:
37803501
Test: Code still compiles
Change-Id: I9326e58aff0d80e441cb92c41e0e4a7d70e32b1b
(cherry picked from commit
5dd1e2de4a7411870d7ca13f549690a6498a6452)
Ajay Panicker [Wed, 17 May 2017 01:46:22 +0000 (18:46 -0700)]
Remove logspam when adding GATT attributes
Bug:
37905488
Test: Code still compiles
Change-Id: I479fc82a15f977b7e3d50b07302241909efc8856
(cherry picked from commit
60177e01c4644d1194d75248e8d2a6b1b40f7670)
Ajay Panicker [Wed, 17 May 2017 01:46:22 +0000 (18:46 -0700)]
Remove logspam when adding GATT attributes
Bug:
37905488
Test: Code still compiles
Change-Id: I479fc82a15f977b7e3d50b07302241909efc8856
Ajay Panicker [Wed, 17 May 2017 05:43:51 +0000 (22:43 -0700)]
Remove logspam when initializing logging for Bluetooth
Bug:
37803501
Test: Code still compiles
Change-Id: I9326e58aff0d80e441cb92c41e0e4a7d70e32b1b
Jaganath Kanakkassery [Mon, 22 May 2017 18:25:59 +0000 (18:25 +0000)]
Merge "Reject LE COC if cid is duplicated" into oc-dev
am:
247a5c25ec
Change-Id: Ie282096381cab5daec8840538820b9d5ed97a718
TreeHugger Robot [Mon, 22 May 2017 18:17:41 +0000 (18:17 +0000)]
Merge "Reject LE COC if cid is duplicated" into oc-dev
Jakub Pawlowski [Thu, 18 May 2017 18:25:34 +0000 (18:25 +0000)]
Protect concurrent access to local state used during BLE scanning
am:
235e738f20
Change-Id: Iff976d8a0599fa35a82e659931bb9a885d9fafd0
Jakub Pawlowski [Wed, 17 May 2017 22:23:22 +0000 (15:23 -0700)]
Protect concurrent access to local state used during BLE scanning
Make sure that all access happens on jni thread
Bug:
38298938
Test: Code compilation
Change-Id: I38246626d2c6390586b314b27889dd9ba905f406
(cherry picked from commit
eb43e9cf12139aeb227e26a8201a80974129c553)
Pavlin Radoslavov [Thu, 18 May 2017 02:16:45 +0000 (02:16 +0000)]
Protect the message loop from accesses after HCI shutdown
am:
fd7e60b1fd
Change-Id: I260db9f87eb20d8eb8f248cf93b31d7906dfc3af
Pavlin Radoslavov [Thu, 18 May 2017 01:30:25 +0000 (01:30 +0000)]
Merge "Protect the message loop from accesses after HCI shutdown" am:
e5a161ef01 am:
5240933dbd
am:
d0a5c8be62
Change-Id: Ib55d27819ae161f22f7852289ac0f036fed06677
Pavlin Radoslavov [Thu, 18 May 2017 01:26:54 +0000 (01:26 +0000)]
Merge "Protect the message loop from accesses after HCI shutdown" am:
e5a161ef01
am:
5240933dbd
Change-Id: Iaf00aea595eacd9da669de3c968e2dc0ad1e2b40
Pavlin Radoslavov [Thu, 18 May 2017 01:23:24 +0000 (01:23 +0000)]
Merge "Protect the message loop from accesses after HCI shutdown"
am:
e5a161ef01
Change-Id: I00d1ae80216d84119234b79d3110bc0f9560b6bf
Treehugger Robot [Thu, 18 May 2017 01:12:49 +0000 (01:12 +0000)]
Merge "Protect the message loop from accesses after HCI shutdown"
Jakub Pawlowski [Thu, 18 May 2017 00:23:20 +0000 (00:23 +0000)]
Protect concurrent access to local state used during BLE scanning am:
eb43e9cf12 am:
e6b3b39b8a
am:
c9d72eeb83
Change-Id: I9c21c468416cf5bb68db3ba25e3ff83015507942
Jakub Pawlowski [Thu, 18 May 2017 00:19:50 +0000 (00:19 +0000)]
Protect concurrent access to local state used during BLE scanning am:
eb43e9cf12
am:
e6b3b39b8a
Change-Id: Iddd799d38d71606131424ab6514f3c7e49786c69
Jakub Pawlowski [Thu, 18 May 2017 00:16:49 +0000 (00:16 +0000)]
Protect concurrent access to local state used during BLE scanning
am:
eb43e9cf12
Change-Id: Ic5b8a1677799e18402921b874a0f58c2e0aa1541
Pavlin Radoslavov [Wed, 17 May 2017 01:50:43 +0000 (18:50 -0700)]
Protect the message loop from accesses after HCI shutdown
Bug:
38330724
Test: Manual: enable/disable Bluetooth
Change-Id: Iaece4cd608c67b28b436ded9fcc51c0bf28f4098
(cherry picked from commit
7277f39540fefe551dc2120fc4db787a9ed57646)
OSDN Git Service
