OSDN Git Service
Myles Watson [Thu, 27 Oct 2016 22:32:22 +0000 (22:32 +0000)]
Remove deprecated UNUSED macro (5/5) am:
d7ffd64acc am:
38f9c25cd4 am:
3a61d85725
am:
b598186787
Change-Id: Ib981fc8d987f5cef1d3a6f97ce1e6228df02dc8f
Myles Watson [Thu, 27 Oct 2016 22:32:16 +0000 (22:32 +0000)]
Remove deprecated UNUSED macro (4/5) am:
64c3f22eb0 am:
865384e4e1 am:
2ae77e68ef
am:
95d5d1f986
Change-Id: I95c00f852ad749875995b3f2ba6e7c639d581f9a
Myles Watson [Thu, 27 Oct 2016 22:32:12 +0000 (22:32 +0000)]
Remove deprecated UNUSED macro (3/5) am:
d628a0695e am:
26b03ba325 am:
99cc957d96
am:
03e17bebee
Change-Id: Ibe0f73bccf55cbba9105633b0e3837c4237cad2b
Myles Watson [Thu, 27 Oct 2016 22:32:03 +0000 (22:32 +0000)]
Remove deprecated UNUSED macro (2/5) am:
b96d349b2a am:
cbf5ec14cb am:
38874e0eb9
am:
ab34719653
Change-Id: Ic9d4af5bbcc7a6a4a93f94aaed659856da037895
Myles Watson [Thu, 27 Oct 2016 22:31:59 +0000 (22:31 +0000)]
Remove deprecated UNUSED macro (1/5) am:
d35a648d39 am:
8a52bb5bbb am:
2879f2226d
am:
96866a9a79
Change-Id: I1f7fd426e3edc88cd754cf15b8a4d039d7cdb7d1
Myles Watson [Thu, 27 Oct 2016 22:26:59 +0000 (22:26 +0000)]
Remove deprecated UNUSED macro (5/5) am:
d7ffd64acc am:
38f9c25cd4
am:
3a61d85725
Change-Id: I8bf908dba4a9523d6b5327a61d13263a1b7f87de
Myles Watson [Thu, 27 Oct 2016 22:26:57 +0000 (22:26 +0000)]
Remove deprecated UNUSED macro (4/5) am:
64c3f22eb0 am:
865384e4e1
am:
2ae77e68ef
Change-Id: I8001e8a862fec97118216d185216403cb067b56e
Myles Watson [Thu, 27 Oct 2016 22:26:54 +0000 (22:26 +0000)]
Remove deprecated UNUSED macro (3/5) am:
d628a0695e am:
26b03ba325
am:
99cc957d96
Change-Id: I7315e8b0e2a7f34167c646826d7c69636c1d91f1
Myles Watson [Thu, 27 Oct 2016 22:26:51 +0000 (22:26 +0000)]
Remove deprecated UNUSED macro (2/5) am:
b96d349b2a am:
cbf5ec14cb
am:
38874e0eb9
Change-Id: I0c67544c15bceee882ce3dc37cc31d4460d7b00d
Myles Watson [Thu, 27 Oct 2016 22:26:48 +0000 (22:26 +0000)]
Remove deprecated UNUSED macro (1/5) am:
d35a648d39 am:
8a52bb5bbb
am:
2879f2226d
Change-Id: I3b658afc24a071ddddc95dbeb90b437bec8dc84a
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:42:02 +0000 (23:42 +0000)]
Replace bluetooth protos with protobuf-lite am:
9a24711fd2 am:
10681a0c01 am:
9de3e5bac9
am:
a99e621a54
Change-Id: Icbd1e5e049456bb4532f3652bac9bc6f9003beb3
Colin Cross [Wed, 26 Oct 2016 23:37:01 +0000 (23:37 +0000)]
Replace bluetooth protos with protobuf-lite am:
9a24711fd2 am:
10681a0c01
am:
9de3e5bac9
Change-Id: I82db0e839cb5e507d84692ff36ff0761bbdcc1b9
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:19:15 +0000 (19:19 +0000)]
Simplify SBC encoder API am:
26f21028e2 am:
72351fbe36 am:
6923697069
am:
eee7423379
Change-Id: Ib9e476269f115d1e58c783d7e62fc5d83028c0a1
Jakub Pawlowski [Wed, 26 Oct 2016 19:14:14 +0000 (19:14 +0000)]
Simplify SBC encoder API am:
26f21028e2 am:
72351fbe36
am:
6923697069
Change-Id: If4073b549d5419d43f2829192471ed635032e87f
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:27:25 +0000 (00:27 +0000)]
Merge "Change how Advertise Data is passed to BTIF (2/3)" am:
f46a405cfa am:
a1e6718776 am:
0828f99970
am:
93f125536f
Change-Id: I1044bc93e6d01097c1ea99c3e8c99f603bbab89b
Jakub Pawlowski [Wed, 26 Oct 2016 00:22:47 +0000 (00:22 +0000)]
Merge "Change how Advertise Data is passed to BTIF (2/3)" am:
f46a405cfa am:
a1e6718776
am:
0828f99970
Change-Id: Ic0214e4d6ea4cf89c3f34716485dc128e95f0e39
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:50:16 +0000 (23:50 +0000)]
Reset reconfig and suspend flags before connecting am:
24940c3655 am:
3f34e9c462 am:
2847ee19a1
am:
7a22e46036
Change-Id: I42e70ef6d67ab3f0fbae2dc560aa6901c9576da4
Tsuyoshi Kamata [Tue, 25 Oct 2016 23:46:38 +0000 (23:46 +0000)]
Reset reconfig and suspend flags before connecting am:
24940c3655 am:
3f34e9c462
am:
2847ee19a1
Change-Id: Ia33e00c71e2e2cd37b0239865e3bc0ce60e6279e
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
Jakub Pawlowski [Tue, 25 Oct 2016 21:45:45 +0000 (21:45 +0000)]
Fix random crashes in HID related code am:
e318faa73a am:
1fe98c51ab am:
90aff7a5d4 -s ours
am:
e6bd775b7c
Change-Id: Ib37ed8d85bf47fc4a0b523c3c6c709e90c357143
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 [Tue, 25 Oct 2016 21:40:55 +0000 (21:40 +0000)]
Fix random crashes in HID related code am:
e318faa73a am:
1fe98c51ab
am:
90aff7a5d4 -s ours
Change-Id: Iae641a9ef0169616589e2426e7f47d5705f12e08
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
Jakub Pawlowski [Tue, 25 Oct 2016 20:57:55 +0000 (20:57 +0000)]
Fix random crashes in HID related code am:
e318faa73a
am:
1fe98c51ab
Change-Id: Ic1010a65720d0e90024e16b87353017321e34f8f
Jakub Pawlowski [Tue, 25 Oct 2016 20:53:26 +0000 (20:53 +0000)]
Fix random crashes in HID related code
am:
e318faa73a
Change-Id: I134f5f63052d7173b106422cebda1c9987c15e4a
Pavlin Radoslavov [Tue, 25 Oct 2016 19:40:56 +0000 (19:40 +0000)]
Merge "Update the A2DP codec setup and selection mechanism" am:
e9fb256c0f am:
798d7343ee am:
7682692318
am:
5a2f2c35a5
Change-Id: Ic559ab887828fb3d8a7180381e5246b99fcafb1e
Pavlin Radoslavov [Tue, 25 Oct 2016 19:37:50 +0000 (19:37 +0000)]
Merge "Update the A2DP codec setup and selection mechanism" am:
e9fb256c0f am:
798d7343ee
am:
7682692318
Change-Id: I72f0c1d284448e058d620f2acc3ec20377b51cfa
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 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
(cherry picked from commit
d8f09d077d9017a522c17f4b9a49328b0ed3e91e)
Jakub Pawlowski [Tue, 25 Oct 2016 00:00:14 +0000 (00:00 +0000)]
Fix random crashes in HID related code am:
d8f09d077d am:
93a0ba93b4 am:
ff5b9e11cb
am:
2a1832aecb
Change-Id: Iac5e5d1d8e5388d181101057ce64c5d1390950e1
Jakub Pawlowski [Mon, 24 Oct 2016 23:55:45 +0000 (23:55 +0000)]
Fix random crashes in HID related code am:
d8f09d077d am:
93a0ba93b4
am:
ff5b9e11cb
Change-Id: Ibe4f1a3027d8336291064061759e067e81a551f5
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:10:26 +0000 (19:10 +0000)]
Merge "Dequeues direct connection request during cancel conn operation" am:
83503b2f11 am:
1104dbb0de am:
09f1661b59
am:
ddb7baeca1
Change-Id: I73e1dee4e9b02d00b1ec7357f8991d1a1a26bf08
Subramanian Srinivasan [Mon, 24 Oct 2016 19:06:56 +0000 (19:06 +0000)]
Merge "Dequeues direct connection request during cancel conn operation" am:
83503b2f11 am:
1104dbb0de
am:
09f1661b59
Change-Id: I6c2725668b9f5287c4b9562ab643faa8c7244b88
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:34:51 +0000 (17:34 +0000)]
Merge "Update macros: Add parens and do-while blocks" am:
73a5208372 am:
1a6c48de1c am:
84be06e850
am:
0dbce78c6f
Change-Id: I264223f0922b90515214f2f1003525c5d579e86f
Myles Watson [Mon, 24 Oct 2016 17:30:50 +0000 (17:30 +0000)]
Merge "Update macros: Add parens and do-while blocks" am:
73a5208372 am:
1a6c48de1c
am:
84be06e850
Change-Id: I53dbe7e77d942d99271e44aebd19f594d8842d42
Gurpreet Ghai [Mon, 24 Oct 2016 17:30:50 +0000 (17:30 +0000)]
Serialize stack shutdown, state change callback and cleanup am:
16e112b186 am:
39bec782ca am:
5a73cbc116
am:
e4bd968264
Change-Id: I5b66e765d486658c2dce340253820d4d66eafcb1
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
Gurpreet Ghai [Mon, 24 Oct 2016 17:27:20 +0000 (17:27 +0000)]
Serialize stack shutdown, state change callback and cleanup am:
16e112b186 am:
39bec782ca
am:
5a73cbc116
Change-Id: Idfe32eb5846e2265b009c5855d322a253e315e40
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:50:58 +0000 (00:50 +0000)]
btif: Add do-while blocks to macros am:
40cde56d28 am:
490f51a908
am:
f6c6a3f75f
Change-Id: I81ad3762dcc1b0eb3911260a92fddc9e838b444c
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:42:33 +0000 (03:42 +0000)]
Merge "btif: Fix formatting in comments" am:
9535bd59ed am:
fd6d5d317e
am:
5e9ea393b0
Change-Id: Iec345dbc4bfa74c4aedd93921887cf2b07bdc9bf
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 01:01:54 +0000 (01:01 +0000)]
Merge "Fix the GATT re-discovery failure when GATT service discovery is ongoing" am:
24efcef985 am:
b8362b512a
am:
53e7fcf153
Change-Id: Ifb345e9bae5435d35b569787525d03e454e18802
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:19:48 +0000 (23:19 +0000)]
Avoid skipping SDP after link key derivation am:
6e8198a22d am:
8b00e8cdb4
am:
7bd5e4dc56
Change-Id: I418185ccfac4b50a4f56cbc1932e58780a6c3562
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:33:59 +0000 (21:33 +0000)]
Merge "Reject AVRCP Metadata command with invalid length" am:
5868633e78 am:
659c6d3454
am:
30af15ec5f
Change-Id: If07f16081e9a319ad11aebb7975d29e3fc26b696
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