OSDN Git Service
Myles Watson [Thu, 30 Mar 2017 02:01:42 +0000 (02:01 +0000)]
Merge "hci: Update error messages" into oc-dev am:
9b0dab91b0
am:
31b1051981
Change-Id: Iab3a69f0b33548764699c5a99e48405b0f34bf8d
Myles Watson [Thu, 30 Mar 2017 01:53:02 +0000 (01:53 +0000)]
Merge "hci: Update error messages" into oc-dev
am:
9b0dab91b0
Change-Id: I18ce3541212afe0d9a44b72e8219bd920f1a739c
TreeHugger Robot [Thu, 30 Mar 2017 01:36:05 +0000 (01:36 +0000)]
Merge "hci: Update error messages" into oc-dev
Pavlin Radoslavov [Thu, 30 Mar 2017 01:26:59 +0000 (01:26 +0000)]
Add new internal API: enableOptionalCodecs()/disableOptionalCodecs() am:
3e4ecfdc4e
am:
d8b436319f
Change-Id: Iadbd402c01affc9f46ab98e1b6f0d07bdd4479a2
Pavlin Radoslavov [Thu, 30 Mar 2017 01:22:43 +0000 (01:22 +0000)]
Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()
am:
3e4ecfdc4e
Change-Id: Id58964dc8a2ab67ee7a1f96e8e94692e5c33076b
Myles Watson [Tue, 21 Mar 2017 17:21:15 +0000 (10:21 -0700)]
hci: Update error messages
Test: builds
Change-Id: I33544572122a166523a40dde090f276b102df247
(cherry picked from commit
ec728d3136aabcd7675aba4a672d932e0709c509)
Pavlin Radoslavov [Fri, 24 Feb 2017 18:35:30 +0000 (10:35 -0800)]
Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()
This API can be used to enable the optional codecs, or disable them
and use only the mandatory SBC.
Internally, it is implemented by raising the SBC priority to
highest (so SBC will be used/selected), or reducing the SBC priority
to its default value (lowest).
Test: A2DP streaming and enabling/disabling/selecting optional codecs
Bug:
35873828
Change-Id: Ia1311d790441b7b5471c9fda7aeee8aa3306b16e
(cherry picked from commit
2073c3eb61f69864e645c50005f11c4e8b5e2588)
Pavlin Radoslavov [Wed, 29 Mar 2017 23:04:17 +0000 (23:04 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
14bf663fb4 am:
bdcd10f073 am:
c306e8c04e
am:
041aa47cec
Change-Id: I8968821ceffce1c63bbf619ed0160eca78ad661d
Pavlin Radoslavov [Wed, 29 Mar 2017 22:57:46 +0000 (22:57 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
14bf663fb4 am:
bdcd10f073
am:
c306e8c04e
Change-Id: I029b38b808fce7bbb737e2d0d7a67890c0bc14ad
Pavlin Radoslavov [Wed, 29 Mar 2017 22:51:59 +0000 (22:51 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
14bf663fb4
am:
bdcd10f073
Change-Id: I5acbf8ab12842149374b41e899bf9623422f0bb7
Pavlin Radoslavov [Wed, 29 Mar 2017 22:46:33 +0000 (22:46 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
am:
14bf663fb4
Change-Id: I030c6950b56373b5eeb9a93eada8b4ea581f2434
Treehugger Robot [Wed, 29 Mar 2017 22:41:13 +0000 (22:41 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
Jorge E. Moreira [Wed, 29 Mar 2017 20:17:43 +0000 (20:17 +0000)]
Merge "Merge "test-vendor-lib: Enable building for 64 bits" am:
46bd270740 am:
8df7a16dc2 am:
70df5cb86e" into oc-dev-plus-aosp
am:
cad1eec0a3
Change-Id: I48221dcbace1c18b1d2dd3306e707c16e84d9995
Pavlin Radoslavov [Wed, 29 Mar 2017 20:17:32 +0000 (20:17 +0000)]
Add missing dependency on the Sony LDAC ABR library libldacBT_abr.so am:
5b812da734
am:
cbbeb33b0e
Change-Id: Ia5bda1fd184bec551c0cb9303400ddcca33fbce3
Android Build Merger (Role) [Wed, 29 Mar 2017 20:15:36 +0000 (20:15 +0000)]
Merge "Merge "test-vendor-lib: Enable building for 64 bits" am:
46bd270740 am:
8df7a16dc2 am:
70df5cb86e" into oc-dev-plus-aosp
Jorge E. Moreira [Wed, 29 Mar 2017 20:15:31 +0000 (20:15 +0000)]
Merge "test-vendor-lib: Enable building for 64 bits" am:
46bd270740 am:
8df7a16dc2
am:
70df5cb86e
Change-Id: I132b99dd605857360034143b2ca1ec68f1f912e0
Pavlin Radoslavov [Wed, 29 Mar 2017 20:15:30 +0000 (20:15 +0000)]
Add missing dependency on the Sony LDAC ABR library libldacBT_abr.so
am:
5b812da734
Change-Id: I96cd251bc5af557f7aaef6e505308f3000d5bab1
Jorge E. Moreira [Wed, 29 Mar 2017 20:13:30 +0000 (20:13 +0000)]
Merge "test-vendor-lib: Enable building for 64 bits" am:
46bd270740
am:
8df7a16dc2
Change-Id: Iaeb8695e5066f44aa199aeedeb7e5865d0002799
Jorge E. Moreira [Wed, 29 Mar 2017 20:12:00 +0000 (20:12 +0000)]
Merge "test-vendor-lib: Enable building for 64 bits"
am:
46bd270740
Change-Id: Ifa8b3d8d8201f6df80d6156e536137e93d90bd01
Treehugger Robot [Wed, 29 Mar 2017 20:08:25 +0000 (20:08 +0000)]
Merge "test-vendor-lib: Enable building for 64 bits"
Pavlin Radoslavov [Fri, 24 Feb 2017 18:35:30 +0000 (10:35 -0800)]
Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()
This API can be used to enable the optional codecs, or disable them
and use only the mandatory SBC.
Internally, it is implemented by raising the SBC priority to
highest (so SBC will be used/selected), or reducing the SBC priority
to its default value (lowest).
Test: A2DP streaming and enabling/disabling/selecting optional codecs
Bug:
35873828
Change-Id: Ia1311d790441b7b5471c9fda7aeee8aa3306b16e
Pavlin Radoslavov [Wed, 29 Mar 2017 01:40:32 +0000 (18:40 -0700)]
Add missing dependency on the Sony LDAC ABR library libldacBT_abr.so
Test: Code compilation
Bug:
35381097
Change-Id: Ib347319942aef4fef6bfd7edc23a4df004fc19fa
(cherry picked from commit
e4f2b615678ccb1fe7e13da4f166c9a45fd16136)
Pavlin Radoslavov [Wed, 29 Mar 2017 06:24:52 +0000 (06:24 +0000)]
Add missing dependency on the Sony LDAC ABR library libldacBT_abr.so am:
e4f2b61567 am:
71b2798c3c am:
7aad5d859e
am:
8687c71c16
Change-Id: I7ddbd5060fe407f077d16b9863003c318baf6be3
Pavlin Radoslavov [Wed, 29 Mar 2017 06:22:41 +0000 (06:22 +0000)]
Add missing dependency on the Sony LDAC ABR library libldacBT_abr.so am:
e4f2b61567 am:
71b2798c3c
am:
7aad5d859e
Change-Id: Id1a61bdb6247690dd9001845465a2ca80f606944
Pavlin Radoslavov [Wed, 29 Mar 2017 06:20:10 +0000 (06:20 +0000)]
Add missing dependency on the Sony LDAC ABR library libldacBT_abr.so am:
e4f2b61567
am:
71b2798c3c
Change-Id: I7ead8e433d807763e8a533156f2a9dbd461eda11
Pavlin Radoslavov [Wed, 29 Mar 2017 06:18:10 +0000 (06:18 +0000)]
Add missing dependency on the Sony LDAC ABR library libldacBT_abr.so
am:
e4f2b61567
Change-Id: I5b18f74c9f85d30b207ef41623d4adc2afc3abef
Pavlin Radoslavov [Wed, 29 Mar 2017 01:40:32 +0000 (18:40 -0700)]
Add missing dependency on the Sony LDAC ABR library libldacBT_abr.so
Test: Code compilation
Bug:
35381097
Change-Id: Ib347319942aef4fef6bfd7edc23a4df004fc19fa
Jorge E. Moreira [Mon, 27 Mar 2017 22:44:55 +0000 (15:44 -0700)]
test-vendor-lib: Enable building for 64 bits
Removes LOCAL_MODULE_PATH which is not supported for 64 bit builds.
Uses LOCAL_PROPRIETARY_MODULE to let the build system know it should
go in the vendor directory.
Test: builds
Change-Id: Iba55d497d8cbe97911a41a5623248306a8954ec2
Myles Watson [Tue, 28 Mar 2017 22:52:11 +0000 (22:52 +0000)]
osi: Update error messages am:
1dc4b361dd am:
e72ef5363f am:
0db1f62fa3
am:
d4d3a216ea
Change-Id: I77d45fc664f37a2f9d0dc113865cc2ac7da65c56
Myles Watson [Tue, 28 Mar 2017 22:48:41 +0000 (22:48 +0000)]
osi: Update error messages am:
1dc4b361dd am:
e72ef5363f
am:
0db1f62fa3
Change-Id: Ieef5390cdf10cea6f4ad113f026ea4bc58e7e819
Myles Watson [Tue, 28 Mar 2017 22:43:09 +0000 (22:43 +0000)]
osi: Update error messages am:
1dc4b361dd
am:
e72ef5363f
Change-Id: Ifed66cfc7097eb3eb36e3a92982619ba8d14f82e
Myles Watson [Tue, 28 Mar 2017 22:39:40 +0000 (22:39 +0000)]
osi: Update error messages
am:
1dc4b361dd
Change-Id: I82f5536a0b088f31d6f922bb671e16fce9f454d7
Myles Watson [Tue, 28 Mar 2017 21:02:33 +0000 (21:02 +0000)]
Merge "hci: Update error messages" am:
09329eede8 am:
d1021404b0 am:
4fa230ce61
am:
6206dfb9db
Change-Id: I8280a456d07f33f0f949fff08fcd8b21024dacbd
Myles Watson [Tue, 28 Mar 2017 21:02:20 +0000 (21:02 +0000)]
Merge "l2cap: Use CHECK for memory allocation errors" am:
b8e1fbd04a am:
7a5646f945 am:
9e73e938f1
am:
fe00fc211c
Change-Id: I5f3a80c39b58a90e70699b2960100c50d34273b3
Myles Watson [Tue, 28 Mar 2017 20:51:40 +0000 (20:51 +0000)]
Merge "hci: Update error messages" am:
09329eede8 am:
d1021404b0
am:
4fa230ce61
Change-Id: Ib859702c6a1b7f0857e48ba6d218862bac54f146
Myles Watson [Tue, 28 Mar 2017 20:51:27 +0000 (20:51 +0000)]
Merge "l2cap: Use CHECK for memory allocation errors" am:
b8e1fbd04a am:
7a5646f945
am:
9e73e938f1
Change-Id: I4c699416104d02756c80d55dff70123093455d6b
Myles Watson [Tue, 28 Mar 2017 20:46:52 +0000 (20:46 +0000)]
Merge "hci: Update error messages" am:
09329eede8
am:
d1021404b0
Change-Id: I53263a1b0336345a8651a1087fd842b8622047a5
Myles Watson [Tue, 28 Mar 2017 20:46:39 +0000 (20:46 +0000)]
Merge "l2cap: Use CHECK for memory allocation errors" am:
b8e1fbd04a
am:
7a5646f945
Change-Id: I4eeae5b305e814da9df9e17a658d6b21e4bef463
Myles Watson [Tue, 21 Mar 2017 17:28:20 +0000 (10:28 -0700)]
osi: Update error messages
Test: build
Change-Id: I5af34f01c47d8037d56c27e7e3fab3cc2f5fd2bc
Myles Watson [Tue, 28 Mar 2017 20:41:15 +0000 (20:41 +0000)]
Merge "hci: Update error messages"
am:
09329eede8
Change-Id: I855deb3f27fa270b13ff61c1f5cea83a6767168d
Myles Watson [Tue, 28 Mar 2017 20:41:01 +0000 (20:41 +0000)]
Merge "l2cap: Use CHECK for memory allocation errors"
am:
b8e1fbd04a
Change-Id: I7464be3483402908d397eda4220c295cbc165669
Treehugger Robot [Tue, 28 Mar 2017 20:37:09 +0000 (20:37 +0000)]
Merge "hci: Update error messages"
Sanket Agarwal [Tue, 28 Mar 2017 20:30:34 +0000 (20:30 +0000)]
Merge "BTA HF_CLIENT: Always reply to +BCS" am:
04f88ffb6c am:
a9b28fbc47 am:
552f1d5c8c
am:
dc1c56e48b
Change-Id: I763cb5f6a0113a3bf87d6ab9ee13ecfadd6f6ef9
Treehugger Robot [Tue, 28 Mar 2017 20:29:26 +0000 (20:29 +0000)]
Merge "l2cap: Use CHECK for memory allocation errors"
Sanket Agarwal [Tue, 28 Mar 2017 20:25:39 +0000 (20:25 +0000)]
Merge "BTA HF_CLIENT: Always reply to +BCS" am:
04f88ffb6c am:
a9b28fbc47
am:
552f1d5c8c
Change-Id: Ia0eb66bed062835b24c86b5fab801b022be4ec52
Sanket Agarwal [Tue, 28 Mar 2017 20:19:22 +0000 (20:19 +0000)]
Merge "BTA HF_CLIENT: Always reply to +BCS" am:
04f88ffb6c
am:
a9b28fbc47
Change-Id: Iccd770fe33afb888269220ce1701404da6d89e97
Sanket Agarwal [Tue, 28 Mar 2017 20:14:54 +0000 (20:14 +0000)]
Merge "BTA HF_CLIENT: Always reply to +BCS"
am:
04f88ffb6c
Change-Id: I71a088b4454333f767aa0d6b106320ad2d7a966c
Treehugger Robot [Tue, 28 Mar 2017 20:03:52 +0000 (20:03 +0000)]
Merge "BTA HF_CLIENT: Always reply to +BCS"
Myles Watson [Tue, 21 Mar 2017 17:16:44 +0000 (10:16 -0700)]
l2cap: Use CHECK for memory allocation errors
Test: LE connection
Change-Id: I43c170b40b125345b91e1c91a7993f0d138ac1c5
Sanket Agarwal [Wed, 22 Feb 2017 19:55:34 +0000 (11:55 -0800)]
BTA HF_CLIENT: Always reply to +BCS
Phones don't like when we don't reply to +BCS codec-negotiation. We were
having this behavior because not always do we want to accept a
connection request over SCO. Instead of not replying to +BCS (which is
essentially a codec negotiation) we rather refuse the SCO request when
it comes in. This creates other issues such as some phones trying to
connect SCO in an infinite loop but it still keeps interoperability with
other devices such as iPhones and Microsoft phones intact
Bug: b/
35469963
Bug: b/
35431871
Bug: b/
35419773
Test: SCO (Phone Audio) test with iPhone, Microsoft and Nexus phones
Change-Id: I5319edcb4da9d66c6d6b3a49742248c90dee98e6
Myles Watson [Tue, 21 Mar 2017 17:21:15 +0000 (10:21 -0700)]
hci: Update error messages
Test: builds
Change-Id: I33544572122a166523a40dde090f276b102df247
fen wang [Tue, 28 Mar 2017 05:20:02 +0000 (05:20 +0000)]
Integration of LDAC Adaptive Bit Rate mechanism am:
dfc02a91a1 am:
2bbd84b0e3
am:
66d7309640
Change-Id: I53f5b3af71ff05c24c40e428665dde981712df7a
fen wang [Tue, 28 Mar 2017 05:11:49 +0000 (05:11 +0000)]
Integration of LDAC Adaptive Bit Rate mechanism am:
dfc02a91a1
am:
2bbd84b0e3
Change-Id: Iae3bb76449af74af89a37be6ef4445fc828996f7
fen wang [Tue, 28 Mar 2017 05:03:51 +0000 (05:03 +0000)]
Integration of LDAC Adaptive Bit Rate mechanism
am:
dfc02a91a1
Change-Id: I5a82550e3f70768063f811c64b7d68e4a85e7ce6
fen wang [Wed, 15 Mar 2017 05:52:52 +0000 (14:52 +0900)]
Integration of LDAC Adaptive Bit Rate mechanism
LDAC ABR controls LDAC encoder bit rate based on A2DP transmit queue
length.
It can be used if the LDAC ABR library is installed on the device:
libldacBT_abr.so
Test: manual
Bug:
35381097
Change-Id: Idcc2fabe86acaf441f5a71f5d2bb66ad29252cdb
Jakub Pawlowski [Mon, 27 Mar 2017 20:54:21 +0000 (20:54 +0000)]
Add option to specify initial LE connection PHY (1/3) am:
96fb273d92 am:
f0b97cad96
am:
4ee5145383
Change-Id: I49a3c0d17f3987cbff52ddbdbbfd7fab4a8ecaea
Jakub Pawlowski [Mon, 27 Mar 2017 20:51:21 +0000 (20:51 +0000)]
Add option to specify initial LE connection PHY (1/3) am:
96fb273d92
am:
f0b97cad96
Change-Id: I16eee0c1c46b93e9e0773e906782f17a9c432900
Jakub Pawlowski [Mon, 27 Mar 2017 20:48:19 +0000 (20:48 +0000)]
Add option to specify initial LE connection PHY (1/3)
am:
96fb273d92
Change-Id: I083e1ef7f4fe6d958fb2f3d4d3faaffd02c2d3be
Jakub Pawlowski [Sat, 25 Mar 2017 00:52:02 +0000 (17:52 -0700)]
Add option to specify initial LE connection PHY (1/3)
For whitelist connections we always use all possible PHYs, for direct
connection use PHY specified by client.
Test: manual
Bug:
30622771
Change-Id: I720f134e2800dc3d282135bb7ffbe3882117c680
Zach Johnson [Fri, 24 Mar 2017 21:26:33 +0000 (21:26 +0000)]
Merge "btm_sec: p_name fails matching security records" am:
e9082e66c2 am:
73071a04b1
am:
f98c8de067
Change-Id: Icebcbde0d537c9bc5d37a9d0577ce12114d32b75
Zach Johnson [Fri, 24 Mar 2017 21:24:03 +0000 (21:24 +0000)]
Merge "btm_sec: p_name fails matching security records" am:
e9082e66c2
am:
73071a04b1
Change-Id: Ic2036538f8eb950c01de850411d4017732d80c0d
Zach Johnson [Fri, 24 Mar 2017 21:22:08 +0000 (21:22 +0000)]
Merge "btm_sec: p_name fails matching security records"
am:
e9082e66c2
Change-Id: Ia2c574d1a36f840045110d55a6d34fb89776890e
Zach Johnson [Fri, 24 Mar 2017 21:19:30 +0000 (21:19 +0000)]
Merge "btm_sec: p_name fails matching security records"
Jakub Pawlowski [Fri, 24 Mar 2017 20:47:14 +0000 (20:47 +0000)]
Expose connection update callback (1/3) am:
b5ba4fdbc4 am:
8e6bf08046
am:
f45314ce13
Change-Id: Iee7714ddedf1a594209657192406ec468be60410
Jakub Pawlowski [Fri, 24 Mar 2017 20:42:05 +0000 (20:42 +0000)]
Expose connection update callback (1/3) am:
b5ba4fdbc4
am:
8e6bf08046
Change-Id: I283b1416e2ad4122137ac585762f4ffa6bfbb9bc
Jakub Pawlowski [Fri, 24 Mar 2017 20:36:43 +0000 (20:36 +0000)]
Expose connection update callback (1/3)
am:
b5ba4fdbc4
Change-Id: I609d1fb2788c93ced5cf4a6afa302fed59543a6d
Martin Brabham [Thu, 16 Feb 2017 23:06:30 +0000 (15:06 -0800)]
btm_sec: p_name fails matching security records
When doing a comparison on p_name that is passed in against
the p_name in the struct will never match if the passed in
name is >= 21 characters. This is due to the strlcpy replacing
the last character with a null termination character.
Without this patch, you will observe 2 security records for
"Android Network Acce" (which is supposed to be "Android Network Access Point")
BTM_SEC_SERVCE_NAME_LEN = 21
21
passed in: |A|n|d|r|o|i|d| |N|e|t|w|o|r|k| |A|c|c|e|s|s| |P|o|i|n|t|
---------------------------------------------------------
structval: |A|n|d|r|o|i|d| |N|e|t|w|o|r|k| |A|c|c|e|\0|
Bug:
34707848
Test: Compile, Manual
Change-Id: I24e0204d8faf54545c7b720a0fbc6765db9a1295
Jakub Pawlowski [Fri, 24 Mar 2017 01:11:04 +0000 (18:11 -0700)]
Expose connection update callback (1/3)
Test: manual
Bug:
30622771
Change-Id: I94d25f6f22b42fb1432a9288c97b82503d57db86
Myles Watson [Fri, 24 Mar 2017 15:57:14 +0000 (15:57 +0000)]
hci: Timestamp HCI commands for timeouts am:
17d3595cf1 am:
8bc0c70cc1
am:
92dd65aa67
Change-Id: I8794647aef2153008ced8c9e021598f2494facea
Myles Watson [Fri, 24 Mar 2017 15:54:40 +0000 (15:54 +0000)]
hci: Timestamp HCI commands for timeouts am:
17d3595cf1
am:
8bc0c70cc1
Change-Id: Ic6aac41fb0320e35bb9e88dfd4782a7ffa4f0655
Myles Watson [Fri, 24 Mar 2017 15:52:39 +0000 (15:52 +0000)]
hci: Timestamp HCI commands for timeouts
am:
17d3595cf1
Change-Id: Ic22314e4b18e8b405f96f38e93849ae2c3dbade8
Myles Watson [Thu, 23 Mar 2017 21:34:40 +0000 (14:34 -0700)]
hci: Timestamp HCI commands for timeouts
Test: Start Bluetooth with COMMAND_PENDING_TIMOUT_MS=2
Change-Id: I393592ede7b9b0aab9c13f6c79756c24edd3d930
Jakub Pawlowski [Fri, 24 Mar 2017 01:17:00 +0000 (01:17 +0000)]
Set preferred PHY and read PHY implementation (3/3) am:
eafd45d086 am:
ba23876865
am:
abe47b88c5
Change-Id: I1f94325ea389cba9a1fa56e6cbdb407d98f9a1a4
Jakub Pawlowski [Fri, 24 Mar 2017 01:15:01 +0000 (01:15 +0000)]
Set preferred PHY and read PHY implementation (3/3) am:
eafd45d086
am:
ba23876865
Change-Id: Ie4bdf53b73df8e4aae8a348d1d23776fc3c546fa
Jakub Pawlowski [Fri, 24 Mar 2017 01:12:59 +0000 (01:12 +0000)]
Set preferred PHY and read PHY implementation (3/3)
am:
eafd45d086
Change-Id: I59ac8486bd565062ebc5c5a9908100c834a0344c
Jakub Pawlowski [Thu, 23 Mar 2017 02:00:47 +0000 (19:00 -0700)]
Set preferred PHY and read PHY implementation (3/3)
Test: manual
Bug:
30622771
Change-Id: I4267238a0b5c7bc373ae1846ebd19a716881a4ec
Myles Watson [Fri, 24 Mar 2017 00:05:14 +0000 (00:05 +0000)]
hci: Cancel timer before running callbacks am:
e7be6de450 am:
dc01e4c0f4
am:
f384911dc7
Change-Id: I49cd56678a508622c9edfa37b12f702b044cc82c
Myles Watson [Fri, 24 Mar 2017 00:03:44 +0000 (00:03 +0000)]
hci: Cancel timer before running callbacks am:
e7be6de450
am:
dc01e4c0f4
Change-Id: Ic588bd854e0365aa49c9f35b8ec0e71879d05f01
Myles Watson [Fri, 24 Mar 2017 00:02:14 +0000 (00:02 +0000)]
hci: Cancel timer before running callbacks
am:
e7be6de450
Change-Id: I96b4b1d76a9354f2564296e8b607f507e69b59e8
Myles Watson [Thu, 23 Mar 2017 18:49:13 +0000 (11:49 -0700)]
hci: Cancel timer before running callbacks
Bug:
36507488
Test: Turn Bluetooth on/off, scan for devices
Change-Id: Ia9334d83b2191504acdab50f777b6d10073226e0
Ajay Panicker [Thu, 23 Mar 2017 20:58:27 +0000 (20:58 +0000)]
Merge "Increase size of written bytes for snprintf for AT+BIND" am:
fca1242cf1 am:
7d2fc68df8
am:
65c4b0a87f
Change-Id: I7a537d99b6e1c1fcab5e5fc9e1086df269e05732
Ajay Panicker [Thu, 23 Mar 2017 20:54:57 +0000 (20:54 +0000)]
Merge "Increase size of written bytes for snprintf for AT+BIND" am:
fca1242cf1
am:
7d2fc68df8
Change-Id: I6a8a5df14408ac09807a5e881dfe94f05e1a8283
Pavlin Radoslavov [Thu, 23 Mar 2017 20:52:39 +0000 (20:52 +0000)]
Fix a race condition inside command_timed_out() when printing log info am:
b77d7129b2 am:
fd7231f3e6
am:
099fc1c9d3
Change-Id: I1b86659b70b2514e748c9710e7292b9bacb5183f
Ajay Panicker [Thu, 23 Mar 2017 20:52:30 +0000 (20:52 +0000)]
Merge "Increase size of written bytes for snprintf for AT+BIND"
am:
fca1242cf1
Change-Id: I648cdddbc18cd94c0b2568082834b1142b666463
Pavlin Radoslavov [Thu, 23 Mar 2017 20:50:11 +0000 (20:50 +0000)]
Fix a race condition inside command_timed_out() when printing log info am:
b77d7129b2
am:
fd7231f3e6
Change-Id: I6509c9929c9f6b8725a8ca53bf207d40c41d2ada
Treehugger Robot [Thu, 23 Mar 2017 20:47:55 +0000 (20:47 +0000)]
Merge "Increase size of written bytes for snprintf for AT+BIND"
Pavlin Radoslavov [Thu, 23 Mar 2017 20:46:46 +0000 (20:46 +0000)]
Fix a race condition inside command_timed_out() when printing log info
am:
b77d7129b2
Change-Id: Ib3dd8f598b62b2706314fea6c3a17f0dac789425
Pavlin Radoslavov [Thu, 23 Mar 2017 19:24:57 +0000 (12:24 -0700)]
Fix a race condition inside command_timed_out() when printing log info
Release the lock after we don't need anymore access to the wait_entry
that was protected by the lock.
Note: We are keeping the lock right before restarting the Bluetooth
process, hence it doesn't matter we are holding it for a bit longer
than before.
Test: Code compilation
Change-Id: Id393a285fce9b9e28efcf0f55fcc32821c5a72b6
Ajay Panicker [Thu, 23 Mar 2017 18:10:12 +0000 (18:10 +0000)]
Merge "AVRCP version interop pereference (1/3)" am:
921f514bcf am:
484e89038a
am:
54666d3a5f -s ours
Change-Id: I18c6e5eda57f79f10d6e548e4bc2b13cdb49ba31
Ajay Panicker [Thu, 23 Mar 2017 18:04:04 +0000 (18:04 +0000)]
Merge "AVRCP version interop pereference (1/3)" am:
921f514bcf
am:
484e89038a
Change-Id: I3edf0eac58364069cae764bebe9805a2d3b87839
Ajay Panicker [Thu, 23 Mar 2017 17:57:48 +0000 (17:57 +0000)]
Merge "AVRCP version interop pereference (1/3)"
am:
921f514bcf
Change-Id: Ia500beaee28b4c335be5367f8b3f8f564ac70e8e
Treehugger Robot [Thu, 23 Mar 2017 17:49:56 +0000 (17:49 +0000)]
Merge "AVRCP version interop pereference (1/3)"
Myles Watson [Thu, 23 Mar 2017 13:31:31 +0000 (13:31 +0000)]
Merge "main: Update error handling" am:
5d637bc524 am:
8bfe9d8cc3
am:
20f32ab121
Change-Id: Idc0233581f04c87a7387a28a71706b0356f84f35
Myles Watson [Thu, 23 Mar 2017 13:29:01 +0000 (13:29 +0000)]
Merge "main: Update error handling" am:
5d637bc524
am:
8bfe9d8cc3
Change-Id: I9f68865c85de59807fee31ef891bda01fbfaf7f3
Myles Watson [Thu, 23 Mar 2017 13:26:01 +0000 (13:26 +0000)]
Merge "main: Update error handling"
am:
5d637bc524
Change-Id: I77b8d202d395d26fbc8a1ae664d7b1b090ff1ba8
Treehugger Robot [Thu, 23 Mar 2017 13:21:52 +0000 (13:21 +0000)]
Merge "main: Update error handling"
Ajay Panicker [Wed, 15 Feb 2017 20:23:35 +0000 (12:23 -0800)]
Increase size of written bytes for snprintf for AT+BIND
snprintf includes the null terminator for size of string to write to buffer.
Having a buffer size of one would only write a null terminator.
Bug:
35348420
Test: HFP Test with carkit
Change-Id: Id81abca562259371520b891e84ec76f6cb434b0c
Ajay Panicker [Sat, 18 Mar 2017 21:58:06 +0000 (14:58 -0700)]
AVRCP version interop pereference (1/3)
Add a mechanism to allow the user to select the AVRCP version broadcasted
through SDP in the developer options. This helps solve some interoperability
issues such as with Honda Carkits where broadcasting AVRCP version 1.6 causes
media metadata to fail.
Bug:
35956792
Test: Select AVRCP version through developer option
Merged-In: Ib55af4406131178846d38ef4da33fb72cb2cd02f
Change-Id: Ib55af4406131178846d38ef4da33fb72cb2cd02f
Ajay Panicker [Sat, 18 Mar 2017 21:58:06 +0000 (14:58 -0700)]
AVRCP version interop pereference (1/3)
Add a mechanism to allow the user to select the AVRCP version broadcasted
through SDP in the developer options. This helps solve some interoperability
issues such as with Honda Carkits where broadcasting AVRCP version 1.6 causes
media metadata to fail.
Bug:
35956792
Test: Select AVRCP version through developer option
Change-Id: Ib55af4406131178846d38ef4da33fb72cb2cd02f
Ivan Podogov [Wed, 22 Mar 2017 00:43:14 +0000 (00:43 +0000)]
Reduce sniff intervals for active mode. am:
be6d6ce0ae am:
947d36410a
am:
b1ff150c92
Change-Id: I2404db4b449d31d5f676a6ec62e9a725e1a40060