OSDN Git Service
Myles Watson [Thu, 27 Oct 2016 22:22:32 +0000 (22:22 +0000)]
Remove deprecated UNUSED macro (5/5) am:
d7ffd64acc
am:
38f9c25cd4
Change-Id: Ic3b67699818aab1a4a7c251203d8b6cb0511c96d
Myles Watson [Thu, 27 Oct 2016 22:22:29 +0000 (22:22 +0000)]
Remove deprecated UNUSED macro (4/5) am:
64c3f22eb0
am:
865384e4e1
Change-Id: Ic4ca94af5ce2a7c3dbd6264cf479be6e639e7bcb
Myles Watson [Thu, 27 Oct 2016 22:22:26 +0000 (22:22 +0000)]
Remove deprecated UNUSED macro (3/5) am:
d628a0695e
am:
26b03ba325
Change-Id: Ib833a3ef2be1203ec9cb44b672624572888e4001
Myles Watson [Thu, 27 Oct 2016 22:22:22 +0000 (22:22 +0000)]
Remove deprecated UNUSED macro (2/5) am:
b96d349b2a
am:
cbf5ec14cb
Change-Id: I389d5346539403e7ae67206ad3d38520bac3ac10
Myles Watson [Thu, 27 Oct 2016 22:22:18 +0000 (22:22 +0000)]
Remove deprecated UNUSED macro (1/5) am:
d35a648d39
am:
8a52bb5bbb
Change-Id: If6619c9d34bf823c3c5a734ec0eb2de05f31382e
Myles Watson [Thu, 27 Oct 2016 22:17:28 +0000 (22:17 +0000)]
Remove deprecated UNUSED macro (5/5)
am:
d7ffd64acc
Change-Id: I070e381cb2e3934a67303fa7895cc8f9359cbe9a
Myles Watson [Thu, 27 Oct 2016 22:17:26 +0000 (22:17 +0000)]
Remove deprecated UNUSED macro (4/5)
am:
64c3f22eb0
Change-Id: I01bb96846ba66afac6dc4089e63b418132327286
Myles Watson [Thu, 27 Oct 2016 22:17:24 +0000 (22:17 +0000)]
Remove deprecated UNUSED macro (3/5)
am:
d628a0695e
Change-Id: I2ca170f67548715b6c0a46b13e410329bc098657
Myles Watson [Thu, 27 Oct 2016 22:17:21 +0000 (22:17 +0000)]
Remove deprecated UNUSED macro (2/5)
am:
b96d349b2a
Change-Id: If58996af9e4e4da611d8ac6fabec3b4b35760e6c
Myles Watson [Thu, 27 Oct 2016 22:17:18 +0000 (22:17 +0000)]
Remove deprecated UNUSED macro (1/5)
am:
d35a648d39
Change-Id: I9253c3eed4cdeda75621aaa38ec87e4d8da5f9e9
Myles Watson [Thu, 27 Oct 2016 17:27:36 +0000 (10:27 -0700)]
Remove deprecated UNUSED macro (5/5)
Include osi.h for UNUSED_ATTR.
Test: mma -j32
Change-Id: I43260669dc1f54639e46cc9620093d727ee86276
Myles Watson [Thu, 27 Oct 2016 17:03:08 +0000 (10:03 -0700)]
Remove deprecated UNUSED macro (4/5)
These variables are the unused results of parsing macros.
Test: mma -j32
Change-Id: Id377b8280d8fb7cf1e4a366d8ac10bdb5a09361c
Myles Watson [Thu, 27 Oct 2016 17:02:37 +0000 (10:02 -0700)]
Remove deprecated UNUSED macro (3/5)
These were caused by ifdefs, so they had to be
done by hand.
TEST: mma -j32
Change-Id: I183f3ee82e8744fed2b65dc96dc492b5bf079243
Myles Watson [Thu, 27 Oct 2016 17:01:49 +0000 (10:01 -0700)]
Remove deprecated UNUSED macro (2/5)
These had to be added by hand.
Test: mma -j32
Change-Id: I0ea126a404fbaa27f2137bc197ee0f48cf87ac28
Myles Watson [Thu, 27 Oct 2016 15:52:16 +0000 (08:52 -0700)]
Remove deprecated UNUSED macro (1/5)
Generated automatically with coccinelle
/* This rule matches functions with arguments
* that have an UNUSED(arg) in the body.
*/
@r1@
identifier arg;
identifier fn;
type t;
parameter list[n] P;
@@
fn(P, const t arg) { ...
UNUSED(arg);
...
}
/* This rule removes the UNUSED line, and adds
* UNUSED_ATTR to the parameter list.
*/
@depends on r1@
identifier r1.arg;
identifier r1.fn;
type r1.t;
parameter list[r1.n] r1.P;
typedef UNUSED_ATTR;
@@
fn(P,
- const t arg
+ UNUSED_ATTR GETRIDOFTHISCOMMA, const t arg
) { ...
-UNUSED(arg);
...
}
Test: mma -j32
Change-Id: Idcaadd688d669d484e557becd050e69454508f3c
Colin Cross [Wed, 26 Oct 2016 23:32:31 +0000 (23:32 +0000)]
Replace bluetooth protos with protobuf-lite am:
9a24711fd2
am:
10681a0c01
Change-Id: Ieb17a0dc4b461c466b8fb4a6803c5b4e324122a6
Colin Cross [Wed, 26 Oct 2016 23:27:31 +0000 (23:27 +0000)]
Replace bluetooth protos with protobuf-lite
am:
9a24711fd2
Change-Id: I5a51b7d05054b5457e9ad9c5827128d1f4c377da
Colin Cross [Wed, 26 Oct 2016 21:25:28 +0000 (14:25 -0700)]
Replace bluetooth protos with protobuf-lite
Use lite protobufs for bluetooth to remove dependency on
libprotobuf-cpp-full, which will be removed from the platform.
Requires dropping support for
adb shell dumpsys bluetooth_manager --proto-text
which requires full protobufs to call TextToString. The functionality
can be restored without adding a dependency on full protobufs with a
host protobuf decoder.
Bug:
32417805
Test: builds
Change-Id: Ifc9ee23264b1bfff3ad1f85ef4914f788028971a
Jakub Pawlowski [Wed, 26 Oct 2016 19:10:15 +0000 (19:10 +0000)]
Simplify SBC encoder API am:
26f21028e2
am:
72351fbe36
Change-Id: Icaa0b406f307ff7546226cb62aea74e42cf6d21c
Jakub Pawlowski [Wed, 26 Oct 2016 19:04:21 +0000 (19:04 +0000)]
Simplify SBC encoder API
am:
26f21028e2
Change-Id: I7c6ed7052c11f1ebe30c973c216cfd83be805c87
Jakub Pawlowski [Tue, 25 Oct 2016 21:28:39 +0000 (14:28 -0700)]
Simplify SBC encoder API
Currently it is unclear what the input, output, and configuration of
the SBC codec are. This patch refactors the use of the SBC_Encoder
function. Parameters for input and output are added, instead of passing
them in alongside the configuration.
Test: Tested A2DP playback
Change-Id: I755a022983f823475c14815cc0610f90a5fbc813
Jakub Pawlowski [Wed, 26 Oct 2016 00:18:46 +0000 (00:18 +0000)]
Merge "Change how Advertise Data is passed to BTIF (2/3)" am:
f46a405cfa
am:
a1e6718776
Change-Id: Ia7520e1719a982182bd8462f5ac8a93a02f1b371
Jakub Pawlowski [Wed, 26 Oct 2016 00:15:17 +0000 (00:15 +0000)]
Merge "Change how Advertise Data is passed to BTIF (2/3)"
am:
f46a405cfa
Change-Id: I80f1930d7ea0262ae425296263261586b567c7a2
Jakub Pawlowski [Wed, 26 Oct 2016 00:10:49 +0000 (00:10 +0000)]
Merge "Change how Advertise Data is passed to BTIF (2/3)"
Tsuyoshi Kamata [Tue, 25 Oct 2016 23:42:37 +0000 (23:42 +0000)]
Reset reconfig and suspend flags before connecting am:
24940c3655
am:
3f34e9c462
Change-Id: I51af7a45aa8a8740b8f3033e4569655964c8348e
Tsuyoshi Kamata [Tue, 25 Oct 2016 23:38:36 +0000 (23:38 +0000)]
Reset reconfig and suspend flags before connecting
am:
24940c3655
Change-Id: Iea795ddf9a145806ad90aec6dcf398c2b5e34dbf
Tsuyoshi Kamata [Wed, 4 Mar 2015 03:09:26 +0000 (12:09 +0900)]
Reset reconfig and suspend flags before connecting
When turning a carkit OFF during music playback, the flags are set to
false. After turning it back ON and re-connecting with the carkit, the
flags are not reset. This causes a potential disconnect when the pause
button is pushed on the carkit.
Bug:
28852454
Change-Id: If51c9b0a9d4180d5d3ca74963aa8186dd3f19e96
Jakub Pawlowski [Wed, 19 Oct 2016 21:46:09 +0000 (14:46 -0700)]
Change how Advertise Data is passed to BTIF (2/3)
The way that AD data is passed right now put some additional
limitations, i.e. only one manufacturer specific data can be set, or
only one service UUID. By moving AD generation to upper layers, aother
set of limitations is removed.
Test: Covered by BleAdvertiseApiTest sl4a test
Bug:
30622771
Change-Id: Iee48ea30ec4c055eaa1ad0b1678686d261106e76
Pavlin Radoslavov [Tue, 25 Oct 2016 19:33:52 +0000 (19:33 +0000)]
Merge "Update the A2DP codec setup and selection mechanism" am:
e9fb256c0f
am:
798d7343ee
Change-Id: Iff7e01c95fed24efb4ad92931b60267896e68db0
Pavlin Radoslavov [Tue, 25 Oct 2016 19:29:24 +0000 (19:29 +0000)]
Merge "Update the A2DP codec setup and selection mechanism"
am:
e9fb256c0f
Change-Id: I18f572822dd1fa55b38fa16a318a0d4a0504748b
Treehugger Robot [Tue, 25 Oct 2016 19:22:40 +0000 (19:22 +0000)]
Merge "Update the A2DP codec setup and selection mechanism"
Jakub Pawlowski [Mon, 24 Oct 2016 23:52:14 +0000 (23:52 +0000)]
Fix random crashes in HID related code am:
d8f09d077d
am:
93a0ba93b4
Change-Id: I6037b252482202f8a0d5b35aa7761ae1a1e021b4
Jakub Pawlowski [Mon, 24 Oct 2016 23:48:44 +0000 (23:48 +0000)]
Fix random crashes in HID related code
am:
d8f09d077d
Change-Id: I1029372edc763e8b52f0be7b9869efa8870039ba
Jakub Pawlowski [Mon, 24 Oct 2016 22:00:12 +0000 (15:00 -0700)]
Fix random crashes in HID related code
Operation on characteristics/descriptors shouldn't access GATT database
when it's executed. This could happen while service rediscovery is in
progress.
Bug:
32240759
Test: connect to HID device
Change-Id: Ie2b6e6b451456204b1cea1e500df9a0ff949a9ef
Pavlin Radoslavov [Mon, 24 Oct 2016 03:39:46 +0000 (20:39 -0700)]
Update the A2DP codec setup and selection mechanism
* Update bta_av_co_audio_set_codec() so it can select among
multiple available A2DP source codecs.
* Rename A2DP_SetCodec() to A2DP_SetSourceCodec() and update
it to use tA2DP_CODEC_SEP_INDEX as an argument to specify
the particular codec (instead of using SBC as default).
Also:
* Move the definition of AVDT_CODEC_SIZE from bt_target.h
to avdt_api.h and increased its value from 10 to 20
* Add missing bta_av_co_audio_sink_has_scmst() check inside
bta_av_co_find_peer_sink_supports_codec()
* Rename (inside bta_av_co.cc): cfg -> config
Bug:
30958229
Test: unit tests and A2DP streaming
Change-Id: I49fcf5063c3b6c4060abdfb60c2db171fa1ff747
Subramanian Srinivasan [Mon, 24 Oct 2016 19:03:26 +0000 (19:03 +0000)]
Merge "Dequeues direct connection request during cancel conn operation" am:
83503b2f11
am:
1104dbb0de
Change-Id: I25c1f94e8d647c809b421ecbf6baa1fa663c051f
Subramanian Srinivasan [Mon, 24 Oct 2016 18:59:56 +0000 (18:59 +0000)]
Merge "Dequeues direct connection request during cancel conn operation"
am:
83503b2f11
Change-Id: I8507dab564116a5076a9db4bb42b651bb7ab1492
Treehugger Robot [Mon, 24 Oct 2016 18:54:29 +0000 (18:54 +0000)]
Merge "Dequeues direct connection request during cancel conn operation"
Myles Watson [Mon, 24 Oct 2016 17:27:20 +0000 (17:27 +0000)]
Merge "Update macros: Add parens and do-while blocks" am:
73a5208372
am:
1a6c48de1c
Change-Id: Idf1761483f20e41298a6adf86224655ffcd58427
Myles Watson [Mon, 24 Oct 2016 17:23:20 +0000 (17:23 +0000)]
Merge "Update macros: Add parens and do-while blocks"
am:
73a5208372
Change-Id: I8839a01690da8fed57ae486bdcb8c326af4abbe0
Gurpreet Ghai [Mon, 24 Oct 2016 17:23:20 +0000 (17:23 +0000)]
Serialize stack shutdown, state change callback and cleanup am:
16e112b186
am:
39bec782ca
Change-Id: Ib7962ba040be880831b22c33d2d8b6a7f4512f0c
Subramanian Srinivasan [Thu, 21 Aug 2014 23:46:04 +0000 (16:46 -0700)]
Dequeues direct connection request during cancel conn operation
When cancel connection request for a device is sent
from an app and if the current pending connection
request's BD address does not match with this device,
the entries of the connection request pending queue
are also checked. If BD address match occurs with an
entry in the connection request queue, the entry is
removed from the queue.
Change-Id: I1bf50a424d86ac53a5201fff742c822f4c8d1c0b
Gurpreet Ghai [Mon, 24 Oct 2016 17:19:50 +0000 (17:19 +0000)]
Serialize stack shutdown, state change callback and cleanup
am:
16e112b186
Change-Id: I0bed40393771dd9940d75ff2352e1bba3b61bf75
Treehugger Robot [Mon, 24 Oct 2016 17:19:33 +0000 (17:19 +0000)]
Merge "Update macros: Add parens and do-while blocks"
Gurpreet Ghai [Mon, 12 Sep 2016 12:06:53 +0000 (17:36 +0530)]
Serialize stack shutdown, state change callback and cleanup
Use Case: Bluetooth On/Off scenario, User switch
Steps:
1. Turn ON Bluetooth
2. Switch user
Also observed on occurrence of enable/disable timeout during On/Off testing.
Failure: Crash while sending state change HAL callback.
Root Cause: In the event when stack cleanup is queued to stack manager
thread when stack shutdown is being processed, stack cleanup starts
execution as soon as stack shutdown is finished.
If the function event_signal_stack_down posted to btif thread at the
end of stack shutdown is executed after stack cleanup crash occurs.
Fix: Serialized the execution of stack shutdown, state change callback
execution and stack cleanup to happen in same order.
Test: code compilation.
Change-Id: Ic96205b5c304acb44eab53f4e2cb150726643bda
Myles Watson [Fri, 21 Oct 2016 23:25:30 +0000 (16:25 -0700)]
Update macros: Add parens and do-while blocks
Test: mma -j32
Change-Id: I7a77fb3e045e29c57cbf2e9c36b8867ca263a82f
Myles Watson [Mon, 24 Oct 2016 00:46:57 +0000 (00:46 +0000)]
btif: Add do-while blocks to macros am:
40cde56d28
am:
490f51a908
Change-Id: Ia738032ee387f55a577f67cf7d5ab00173a4c07b
Myles Watson [Mon, 24 Oct 2016 00:43:57 +0000 (00:43 +0000)]
btif: Add do-while blocks to macros
am:
40cde56d28
Change-Id: Ib22adbe2c49c97b0f65e8b3c6b0fe4847535c469
Myles Watson [Fri, 21 Oct 2016 16:39:13 +0000 (09:39 -0700)]
btif: Add do-while blocks to macros
Test: mma -j32
Change-Id: Ie82465b8cef6c4f527fad13892abb365e15dad7c
Myles Watson [Sat, 22 Oct 2016 03:40:03 +0000 (03:40 +0000)]
Merge "btif: Fix formatting in comments" am:
9535bd59ed
am:
fd6d5d317e
Change-Id: I3a2f462ba9ce1ad4c5e6d1785eb85eca411812eb
Myles Watson [Sat, 22 Oct 2016 03:37:03 +0000 (03:37 +0000)]
Merge "btif: Fix formatting in comments"
am:
9535bd59ed
Change-Id: I9c244a0793d1155b4e3e9b49fe5dc61cb343e2ee
Treehugger Robot [Sat, 22 Oct 2016 03:29:07 +0000 (03:29 +0000)]
Merge "btif: Fix formatting in comments"
IHLHO KIM [Sat, 22 Oct 2016 00:59:23 +0000 (00:59 +0000)]
Merge "Fix the GATT re-discovery failure when GATT service discovery is ongoing" am:
24efcef985
am:
b8362b512a
Change-Id: Ifee08526b9a6b039fe8ef5d7fa5be8656076d737
IHLHO KIM [Sat, 22 Oct 2016 00:56:54 +0000 (00:56 +0000)]
Merge "Fix the GATT re-discovery failure when GATT service discovery is ongoing"
am:
24efcef985
Change-Id: I89dad9199e4664674889e293c4f1b5fcf9d0106b
Treehugger Robot [Sat, 22 Oct 2016 00:54:38 +0000 (00:54 +0000)]
Merge "Fix the GATT re-discovery failure when GATT service discovery is ongoing"
Nitin Arora [Fri, 21 Oct 2016 23:17:18 +0000 (23:17 +0000)]
Avoid skipping SDP after link key derivation am:
6e8198a22d
am:
8b00e8cdb4
Change-Id: I15bcc051fc6f9297f88b0437377eb88090a46658
Nitin Arora [Fri, 21 Oct 2016 23:14:46 +0000 (23:14 +0000)]
Avoid skipping SDP after link key derivation
am:
6e8198a22d
Change-Id: I52e5ed17fd3668eaeaa578b6f0e862e45e46abbe
Myles Watson [Fri, 21 Oct 2016 16:45:42 +0000 (09:45 -0700)]
btif: Fix formatting in comments
Test: mma -j32
Change-Id: I851e21d9f2935ab2afbf5e063f6df31e8d50c305
IHLHO KIM [Fri, 23 Sep 2016 07:43:54 +0000 (07:43 +0000)]
Fix the GATT re-discovery failure when GATT service discovery is ongoing
If 'BTA_GATTC_Refresh' is called when GATT service discovery is ongoing, GATT service discovery should be restarted after GATT service discovery is completed.
But it cannot be restarted actually because of missing set 'auto_update' state.
This patch set 'auto_update' state to start discovery again correctly.
Change-Id: Id18f04705fef253261e52836849e4e6020e42a05
Nitin Arora [Wed, 13 Apr 2016 22:53:03 +0000 (15:53 -0700)]
Avoid skipping SDP after link key derivation
Use Case:
In case of cross key derivation of BR link key from a secure LTK,
the corresponding BR transport needs to go through the SDP routine
and alert the upper layers regarding the bond completion of the
BR transport. This specific procedure is currently getting skipped
in an attempt to prevent spurious link key notifications from causing
bond state changes
Fix:
Added an additional check to make sure that the LE pairing is not
ongoing before skipping the SDP. This uses the sequence of operations
where the LE LTK is generated first and link key is derived from the
LTK.
Test: mma -j32
Change-Id: Ife242c93c3adf90d581ac0bbf4896dd164b9f8e2
Anubhav Gupta [Fri, 21 Oct 2016 21:21:31 +0000 (21:21 +0000)]
Merge "Reject AVRCP Metadata command with invalid length" am:
5868633e78
am:
659c6d3454
Change-Id: Idae197b03b0202d75cc452b7335474466fd687a2
Anubhav Gupta [Fri, 21 Oct 2016 21:09:58 +0000 (21:09 +0000)]
Merge "Reject AVRCP Metadata command with invalid length"
am:
5868633e78
Change-Id: I038693a9d67ec55a3b2c6ad76a2419675809a29b
Treehugger Robot [Fri, 21 Oct 2016 20:48:55 +0000 (20:48 +0000)]
Merge "Reject AVRCP Metadata command with invalid length"
Satish Kodishala [Fri, 21 Oct 2016 20:36:30 +0000 (20:36 +0000)]
Merge "Disable HSP profile during BT turn off" am:
b60f387dcb
am:
f432c13bfb
Change-Id: I2cec38536519575b4a6ea494c79379f91312dbce
Satish Kodishala [Fri, 21 Oct 2016 20:27:31 +0000 (20:27 +0000)]
Merge "Disable HSP profile during BT turn off"
am:
b60f387dcb
Change-Id: I2829458dad58cf4628626dd6ef732e2e77bc6e96
Treehugger Robot [Fri, 21 Oct 2016 20:16:07 +0000 (20:16 +0000)]
Merge "Disable HSP profile during BT turn off"
Nitin Arora [Fri, 21 Oct 2016 19:15:54 +0000 (19:15 +0000)]
Prevent multiple register of service change indication am:
645ee14ce2
am:
74ae79a705
Change-Id: Ifbae85256ee6f5056f86904f1ad04d74983e6bac
Nitin Arora [Fri, 21 Oct 2016 19:07:55 +0000 (19:07 +0000)]
Prevent multiple register of service change indication
am:
645ee14ce2
Change-Id: Id7c4b9c6f96a976c4a3a0b993c725cab3d605f7c
Satish Kodishala [Wed, 9 Mar 2016 13:27:01 +0000 (18:57 +0530)]
Disable HSP profile during BT turn off
Usecase:
1. Enable HSP profile only.
2. Do Network reset.
3. Connect to headset supporting HSP profile.
Failure:
Not able to connect to headset after network reset.
Rootcause:
During BT turn off, HFP profile is disabled instead of
HSP profile. This led to the HSP profile registration
from apps failed during turn on after network reset.
Fix:
Add a check to see if HFP or HSP profile is enabled
during BT turn off.
Test: code compilation
Change-Id: Ie7bd7b546c377f4a060bc89916640035a047d086
Anubhav Gupta [Wed, 21 May 2014 14:33:00 +0000 (20:03 +0530)]
Reject AVRCP Metadata command with invalid length
This change ensures that DUT rejects AVRCP Meta command
having invalid data length to avoid crash while processing
the invalid command further.
This crash was seen while running codenomicon test suit.
Change-Id: I8a591d601636a0fce268b5b965f2bd691c24c319
Nitin Arora [Thu, 16 Jun 2016 22:27:59 +0000 (15:27 -0700)]
Prevent multiple register of service change indication
Use Case:
Pair DUT to a remote LE device. The host registers for the service
change indication twice, once when the connection callback is
received and another time, when the SMP process completes
Failure:
There are a few issues caused by this.
First, the duplicate action of service change indication registeration
is unnecessary.
The registeration that follows the SMP process adds a gatt_if to the
apps holding the current link. This gatt_if (=1) never disconnects
after registeration failure or success. And hence the host can never
physically disconnect the link.
Fix:
This change removes the service change registeration at SMP
process completion
Test: manual
Change-Id: I0d7566e2b4a9d01aa7926cdbe9f528c3941fcfeb
Pavlin Radoslavov [Fri, 21 Oct 2016 16:27:46 +0000 (16:27 +0000)]
Merge "Remove multiplexing capability in AVDTP" am:
05de2a8ce0
am:
1473cfc456
Change-Id: I918ee4ccb0ac6786634cedef605452bdbc722921
Pavlin Radoslavov [Fri, 21 Oct 2016 16:18:15 +0000 (16:18 +0000)]
Merge "Remove multiplexing capability in AVDTP"
am:
05de2a8ce0
Change-Id: I95714562cca9590f42a160f0dababf0af5c20bd3
Treehugger Robot [Fri, 21 Oct 2016 16:12:53 +0000 (16:12 +0000)]
Merge "Remove multiplexing capability in AVDTP"
Myles Watson [Fri, 21 Oct 2016 16:09:17 +0000 (16:09 +0000)]
btif: Fixup clang-format am:
f45481678a
am:
8bd1dda431
Change-Id: I09d435d34827b250dc768e9bc634e7ea655da4cf
Myles Watson [Fri, 21 Oct 2016 16:09:14 +0000 (16:09 +0000)]
btif: Apply clang-format am:
6bd442f543
am:
b6e056832f
Change-Id: I01814fd045b029d5d7599e61072014c70418eea8
Myles Watson [Fri, 21 Oct 2016 16:00:17 +0000 (16:00 +0000)]
btif: Fixup clang-format
am:
f45481678a
Change-Id: Ibcca014e18451af924b06f4ee1ab5af306279ebc
Myles Watson [Fri, 21 Oct 2016 16:00:14 +0000 (16:00 +0000)]
btif: Apply clang-format
am:
6bd442f543
Change-Id: I06292eb468ed8e063f90792f08cce7e2249dcd7e
Myles Watson [Wed, 19 Oct 2016 16:53:56 +0000 (09:53 -0700)]
btif: Fixup clang-format
In src/btif_sock_l2cap.cc:
Move a comment before the define and run clang-format again.
Fix formatting in comments that were more than 80-characters wide.
Test: mma -j32
Change-Id: I17465a1425d1de9a28f0675fe65c8529359a87af
Myles Watson [Wed, 19 Oct 2016 16:50:22 +0000 (09:50 -0700)]
btif: Apply clang-format
clang-format doesn't understand block quotes of this form:
/* This is not handled well
** because there are two asterisks
**/
cd btif/
# Replace '**' at the beginning of the line with ' *'
sed 's/^[*][*]/ \*/' -i include/* src/* test/* co/*
clang-format --style=file -i src/* include/* test/* co/*
Test: mma -j32
Change-Id: I2477eae5480602d5b2fee5ec89c9ed7888022341
Pavlin Radoslavov [Fri, 21 Oct 2016 01:30:05 +0000 (18:30 -0700)]
Remove multiplexing capability in AVDTP
Remove code guarded by AVDT_MULTIPLEXING.
This functionality is not used, and appears broken.
Test: code compilation and A2DP streaming
Change-Id: Ib87a905c61cff6b3b41d1858b90666d846847d0d
Jakub Pawlowski [Thu, 20 Oct 2016 22:30:24 +0000 (22:30 +0000)]
Merge "Various small warning/build fixes for Linux" am:
ed82cc2e6c
am:
ea9c52207c
Change-Id: I29bdc195c759a43cd3a7d111649029b96931987b
Andre Eisenbach [Thu, 20 Oct 2016 22:24:34 +0000 (15:24 -0700)]
Fix merge error; duplicate BTM_SecClearSecurityFlags
Test: compiles
Change-Id: Ifbe5b7e3a67690789dfa7d92e0c4235dddf193a6
Jakub Pawlowski [Thu, 20 Oct 2016 22:23:23 +0000 (22:23 +0000)]
Merge "Various small warning/build fixes for Linux"
am:
ed82cc2e6c
Change-Id: Ic5dfc70bd83c86475dee16062563a02ae932888c
Treehugger Robot [Thu, 20 Oct 2016 22:16:03 +0000 (22:16 +0000)]
Merge "Various small warning/build fixes for Linux"
Jacky Cheung [Thu, 20 Oct 2016 21:43:25 +0000 (21:43 +0000)]
Merge "DO NOT MERGE ANYWHERE Add Wear-specific feature to override LE IO capability" into cw-f-dev
am:
67560541dd -s ours
Change-Id: I3bc4380d5604137577a5cf9dea838f8ab6b1b7ab
Jacky Cheung [Thu, 20 Oct 2016 21:29:39 +0000 (21:29 +0000)]
DO NOT MERGE ANYWHERE Add Wear-specific feature to override LE IO capability
am:
0cb0e9346d -s ours
Change-Id: Ia06cb0da3e523da97dcc226f247ef8cbdb39d9ea
Andre Eisenbach [Thu, 20 Oct 2016 20:50:48 +0000 (20:50 +0000)]
Reset device security flags when pairing fails am:
667e1fe3d7
am:
c5c4730537
Change-Id: Ia55ed4ea0089e5bd23d375367aaa311b75b570b3
Andre Eisenbach [Thu, 20 Oct 2016 20:49:46 +0000 (20:49 +0000)]
Reset device security flags when pairing fails am:
415d112056
am:
d3f71beec7
Change-Id: I613473f665f387cf5ac0f85e0bfafbddc03882a9
Jacky Cheung [Thu, 20 Oct 2016 20:42:05 +0000 (20:42 +0000)]
Merge "DO NOT MERGE ANYWHERE Add Wear-specific feature to override LE IO capability" into cw-f-dev
Andre Eisenbach [Thu, 20 Oct 2016 20:41:17 +0000 (20:41 +0000)]
Reset device security flags when pairing fails
am:
415d112056
Change-Id: If584eba5a0b31c2857908eb01c77372b53e9b349
Andre Eisenbach [Thu, 20 Oct 2016 20:33:35 +0000 (20:33 +0000)]
Reset device security flags when pairing fails
am:
667e1fe3d7
Change-Id: I1dd2d6d1a3f1dd613ae6d02d167f4fd7e015aadf
Andre Eisenbach [Tue, 18 Oct 2016 00:32:45 +0000 (17:32 -0700)]
Reset device security flags when pairing fails
Bug:
29998634
Test: manual
Change-Id: Icd9a76a065de147372df060c0b9555c75bcf46bc
Andre Eisenbach [Tue, 18 Oct 2016 00:32:45 +0000 (17:32 -0700)]
Reset device security flags when pairing fails
Bug:
29998634
Test: manual
(cherry picked from commit
54ee9431e8bf0ec1c47d7306fd7a3d0975590733)
Change-Id: I8bd0ce5b797e30009260f7fe673f389d066db9ac
Jakub Pawlowski [Thu, 20 Oct 2016 17:19:50 +0000 (10:19 -0700)]
Various small warning/build fixes for Linux
Test: build with ninja
Change-Id: Ic0f4d23e4a56a42be6e660f2afec83400ea6daa6
Jakub Pawlowski [Thu, 20 Oct 2016 15:55:07 +0000 (15:55 +0000)]
Various small fixes for Linux build am:
029a43b78e
am:
2c9bd8d049
Change-Id: Iea55c43b541557804b7cd17eff9dd2721c2c8c4e
Jakub Pawlowski [Thu, 20 Oct 2016 15:47:22 +0000 (15:47 +0000)]
Various small fixes for Linux build
am:
029a43b78e
Change-Id: Ie75a6f935ee4071cf5d0431ce6168fda9947d411
Jakub Pawlowski [Thu, 20 Oct 2016 06:31:13 +0000 (23:31 -0700)]
Various small fixes for Linux build
* add "-latomic" which was missing since we moved to clang
* empty LOG_EVENT_INT stub added for Linux
* add link libraries to fix stack_unittest
* add missing headers
Test: build with ninja
Change-Id: I1fe0b0b615db1da5ad083c162cb207b08979ce15
Jakub Pawlowski [Thu, 20 Oct 2016 02:00:33 +0000 (02:00 +0000)]
Move libhardware dependency to third_party folder on Linux am:
d550019746
am:
9594fb0b2c
Change-Id: I5b26d6955a86eb4f2ac2059f73c7b9d6d78f4d35
Jakub Pawlowski [Thu, 20 Oct 2016 01:52:32 +0000 (01:52 +0000)]
Move libhardware dependency to third_party folder on Linux
am:
d550019746
Change-Id: I270320ff6231af46b3f38d6e96ab8e95bfb236da