OSDN Git Service
Pavlin Radoslavov [Thu, 13 Jul 2017 18:16:22 +0000 (18:16 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e
am:
27db9becc7
Change-Id: I5a5ea407d003fc297ee89837ff22fcc0d946c735
Pavlin Radoslavov [Thu, 13 Jul 2017 18:16:08 +0000 (18:16 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948
am:
b4cf6c5aa7
Change-Id: I915ceaf816dc806ba91da7791aa1b43460615935
Pavlin Radoslavov [Thu, 13 Jul 2017 18:13:55 +0000 (18:13 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev
am:
d2a3649d6e
Change-Id: I781ce0eb5e6ea5b8b8fb029afe6caf81bd9ca9fb
Pavlin Radoslavov [Thu, 13 Jul 2017 18:13:38 +0000 (18:13 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote
am:
f7a7f7a948
Change-Id: I5d1c8050de38dde922f9891e70574205422ee7be
TreeHugger Robot [Thu, 13 Jul 2017 18:04:48 +0000 (18:04 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev
Pavlin Radoslavov [Thu, 13 Jul 2017 01:39:31 +0000 (18:39 -0700)]
Disable PAN Reverse Tethering when connection originated by the Remote
* Check for valid interactions between the three PAN profile roles per
Table 1 in PAN Profile v1.0 spec.
* Explicitly disable connections to the local PANU if the remote is
not PANU.
Bug:
63145701
Test: External script
Change-Id: I29a7e404ba7e4453b6a7c59148a2b3eb7395303a
Merged-In: I29a7e404ba7e4453b6a7c59148a2b3eb7395303a
(cherry picked from commit
9aea2c2f92dd5245f6b35d564ce8e471fec2b4ec)
(cherry picked from commit
3f2ee5b546b65b5b021779588316249276ed3827)
(cherry picked from commit
40c7cefb12ac1a70bf7b1c770c1ab21a5b3f229e)
Pavlin Radoslavov [Thu, 6 Jul 2017 20:39:02 +0000 (13:39 -0700)]
Allocate buffers of the right size when BT_HDR is included
Bug:
63146105
Test: External script
Change-Id: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
Merged-In: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
(cherry picked from commit
d88838a7237cd672d87b6b9cc8d56fff625fd1d5)
(cherry picked from commit
b648c7dfe45c57842d58576f558fdf8edff10bec)
Jack He [Tue, 11 Apr 2017 22:08:06 +0000 (22:08 +0000)]
Check LE advertising data length before caching advertising records am:
1bef3546a6
am:
e6620d18cf
Change-Id: I412c0dd7854d7f6157e1974e285078909543bb41
Jack He [Tue, 11 Apr 2017 22:03:05 +0000 (22:03 +0000)]
Check LE advertising data length before caching advertising records
am:
1bef3546a6
Change-Id: Ibbf6183833d7f00937742fa337a04569c4ef3c2f
Jack He [Thu, 6 Apr 2017 00:59:58 +0000 (17:59 -0700)]
Check LE advertising data length before caching advertising records
Bug:
33899337
Test: make, receive LE advertising
Change-Id: I06b249ac5cabdef64528deda07b8bae749e1d2fd
(cherry picked from commit
d57adbc350fdee4f27b82c9e39a14bd745d92320)
Pavlin Radoslavov [Tue, 14 Mar 2017 21:05:16 +0000 (21:05 +0000)]
Check the HCI length before extracting the L2CAP length and CID am:
33c68c82c1
am:
172f0d8f7c
Change-Id: Ifb002936f93d85d635ab76ddf52c0ddb44cb9d3e
Pavlin Radoslavov [Tue, 14 Mar 2017 20:59:46 +0000 (20:59 +0000)]
Check the HCI length before extracting the L2CAP length and CID
am:
33c68c82c1
Change-Id: I1f94530ef90162747ef6a62c3a601856ea1d6672
Pavlin Radoslavov [Wed, 8 Mar 2017 02:48:21 +0000 (18:48 -0800)]
Check the HCI length before extracting the L2CAP length and CID
Bug:
34946955
Test: A2DP streaming to a headset
Change-Id: I0b6f50dee05a58db8c043b4d01fb58c9acbeede9
(cherry picked from commit
ecc0835114cbae3033d8b0e25bd8b443880d5077)
Sharvil Nanavati [Wed, 22 Jun 2016 01:13:44 +0000 (01:13 +0000)]
resolve merge conflicts of
1f433cb to mnc-dr-dev
am:
f15ca6d21d -s ours
Change-Id: Ic1a23e2c6d0284b9fdf346a681f59cdcbaa599e0
Sharvil Nanavati [Tue, 21 Jun 2016 22:56:42 +0000 (15:56 -0700)]
resolve merge conflicts of
1f433cb to mnc-dr-dev
Change-Id: I7278875d21c59316217cb1b99d902f4fc248ca06
Sharvil Nanavati [Tue, 21 Jun 2016 02:16:12 +0000 (19:16 -0700)]
DO NOT MERGE Fix potential DoS caused by delivering signal to BT process
Bug:
28885210
Change-Id: I63866d894bfca47464d6e42e3fb0357c4f94d360
Ajay Panicker [Tue, 24 May 2016 22:10:22 +0000 (22:10 +0000)]
Merge "Add guest mode functionality (2/3)" into mnc-dev am:
4439d380e5
am:
99bbe2fffe -s ours
* commit '
99bbe2fffe98c57295a26d35b30e15c432d6a1e3':
Add guest mode functionality (2/3)
Change-Id: Ie493166a8d452f2892bb96323b23527efe053dd7
Ajay Panicker [Tue, 24 May 2016 22:02:04 +0000 (22:02 +0000)]
Merge "Add guest mode functionality (2/3)" into mnc-dev
am:
4439d380e5
* commit '
4439d380e5e2ec3c24b04f7eba1bcbceae78191a':
Add guest mode functionality (2/3)
Change-Id: Ia13560babbc18e2ee290e16f9b03fb5202894c23
Ajay Panicker [Tue, 24 May 2016 21:53:32 +0000 (21:53 +0000)]
Merge "Add guest mode functionality (2/3)" into mnc-dev
Pavlin Radoslavov [Thu, 12 May 2016 18:36:44 +0000 (11:36 -0700)]
DO NOT MERGE ANYWHERE Restart failed system calls interrupted with errno of EINTR
In number of places we don't handle properly system calls failures
when the errno is EINTR (i.e., the system call was interrupted
by a signal). In all our use cases, the system calls should be
restarted. The handling of the following system calls (as used in the code)
has been updated/fixed:
poll, send, recv, sendmsg, nanosleep, epoll_wait
read - mostly (e.g., socket-like fds)
write - mostly (e.g., socket-like fds)
select, accept, connect
Bug:
28471477
Bug:
28658141
Change-Id: I03e6f0f67e33876780fb6d02c33eb84547ba8f95
Marie Janssen [Mon, 16 May 2016 17:59:28 +0000 (17:59 +0000)]
DO NOT MERGE btif: check overflow on create_pbuf size am:
ad31ee0f0f
am:
d47ab963e1
* commit '
d47ab963e1b6afd164bcfb051fe55ec47c1d211d':
DO NOT MERGE btif: check overflow on create_pbuf size
Change-Id: I839427756e92067e8c54822988648a85e537cc27
Marie Janssen [Mon, 16 May 2016 17:57:02 +0000 (17:57 +0000)]
DO NOT MERGE btif: check overflow on create_pbuf size
am:
ad31ee0f0f
* commit '
ad31ee0f0f03953064cc503314d5e39d687af50a':
DO NOT MERGE btif: check overflow on create_pbuf size
Change-Id: I77748f8ce26e15cf87f53cf3a34a11ecc19471f5
Marie Janssen [Thu, 12 May 2016 22:30:16 +0000 (15:30 -0700)]
DO NOT MERGE btif: check overflow on create_pbuf size
Bug:
27930580
Change-Id: Ieb1f23f9a8a937b21f7c5eca92da3b0b821400e6
Jacky Cheung [Wed, 11 May 2016 19:17:31 +0000 (12:17 -0700)]
DO NOT MERGE ANYWHERE SMP: Delay authorization complete.
Delay authorization complete during Bond Pending state in SMP.
Instead of automatically advancing the Bond Pending state, create
a 500ms window to allow the slave to stop pairing by sending over
the Pairing Failed command during the Bond Pending state.
BUG:
28475887
Change-Id: I164e8312fdf9170d0f36caf404fc42e293ed5d79
Andre Eisenbach [Wed, 11 May 2016 03:27:20 +0000 (20:27 -0700)]
DO NOT MERGE ANYWHERE Fix double mutex unlock and if() condition
Commit "L2CAP and SDP Search API for BT profiles (2/2)" introduced two
separate issues in btsock_rfc_signaled():
1. The "slot_lock" potentially gets unlocked twice, causing
undefined behaviour.
2. The call to BTA_JvRfcommWrite() was incorrectly taken outside
of the conditional if() block that only executes the code if
data is available.
This patch reverts the relevant locking change and fixes the if()
condition.
Bug:
27204458
Change-Id: I63b1257d21ca7bdd248858ec67e28f64e37a7895
(cherry picked from commit
2d7ddd09c163c84eacddd101cf08fd8021a35370)
Ajay Panicker [Fri, 18 Mar 2016 00:09:24 +0000 (17:09 -0700)]
Add guest mode functionality (2/3)
Add a flag to enable() to start Bluetooth in restricted
mode. In restricted mode, all devices that are paired during
restricted mode are deleted upon leaving restricted mode.
Right now restricted mode is only entered while a guest
user is active.
Bug:
27410683
Change-Id: I8f23d28ef0aa3a8df13d469c73005c8e1b894d19
Marie Janssen [Fri, 15 Apr 2016 18:44:09 +0000 (11:44 -0700)]
resolve merge conflicts of
4b1a22e to cw-e-dev
Change-Id: Iba2d0c5b4949e4d5d4b8810123d5229d8543991b
Marie Janssen [Fri, 15 Apr 2016 18:18:05 +0000 (18:18 +0000)]
btif: Don\'t persist remote devices to the config
am:
b646eb3
* commit '
b646eb39070ab8bd6f91691b8c3388464d37e082':
btif: Don't persist remote devices to the config
Change-Id: I355911d7cfff54a730994766223611edc34b4378
Lianchao Song [Wed, 23 Mar 2016 03:03:19 +0000 (11:03 +0800)]
DO NOT MERGE ANYWHERE Do not update sco_state when no matching peer_addr is found
In the bta_hf_client_sco_conn_cback function, sco_state should not be set to
BTA_HF_CLIENT_SCO_SHUTDOWN_ST when no matched peer_addr found, so that it
can handle BTA_HF_CLIENT_SCO_OPEN_E event later.
Bug:
26416310
Change-Id: I4540230c792490f79e4cca24cb4b34a1c383422f
Signed-off-by: m00230717 <m00230717@notesmail.huawei.com>
Marie Janssen [Fri, 25 Mar 2016 20:37:13 +0000 (13:37 -0700)]
btif: Don't persist remote devices to the config
We don't need to persist the unpaired devices to NVRAM
so skip saving them.
This fixes a regression in a previous patch where the most recent
instead of the least recent devices would be removed, making some
devices unpairable in extremely busy environments.
This is a backport of http://r.android.com/210955 and
http://r.android.com/212838 together.
Bug:
26071376
Change-Id: If7ee9d960f70c836bf08b78da5f3fc852ba60a85
Alain Vongsouvanh [Fri, 25 Mar 2016 20:13:11 +0000 (20:13 +0000)]
Merge "DO NOT MERGE ANYWHERE Bring back support for legacy bt_config.xml" into cw-e-dev
Alain Vongsouvanh [Fri, 25 Mar 2016 17:53:40 +0000 (10:53 -0700)]
DO NOT MERGE ANYWHERE Bring back support for legacy bt_config.xml
An earlier CL introducing backup support for bt_config.conf blew up
support for legacy file, making upgrading from L-based OS to M-based OS
lose its bluetooth config.
BUG=
27824878
Change-Id: Ic23ef2a3559b04224278edffdc0e9380c2760638
Zhao Xuewen [Thu, 4 Feb 2016 03:20:14 +0000 (11:20 +0800)]
DO NOT MERGE ANYWHERE Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect.
If peer A2DP SNK disconnected by some reason, the device will reject reconnection request from peer.
This CL will judge the peer device is A2DP SRC, will reject the reconnection request.
So if peer device is A2DP SNK, will accept the reconnection request.
BUG:
26274393
Change-Id: Idecef527a763693f08d76d90512546f013312aa1
Signed-off-by: z00184990 <z00184990@notesmail.huawei.com>
Signed-off-by: Zhao Xuewen <zhaoxuewen@huawei.com>
Marie Janssen [Wed, 23 Mar 2016 20:44:12 +0000 (20:44 +0000)]
DO NOT MERGE Check size of pin before replying am:
f0a69c3
am:
d016a5e
* commit '
d016a5e1a7f32e3c8e52feb1e09822279e74de17':
DO NOT MERGE Check size of pin before replying
Marie Janssen [Wed, 23 Mar 2016 20:40:07 +0000 (20:40 +0000)]
DO NOT MERGE Check size of pin before replying
am:
f0a69c3
* commit '
f0a69c392117c69c5f66dd239f5a5cfd89a7331e':
DO NOT MERGE Check size of pin before replying
Sharvil Nanavati [Mon, 21 Mar 2016 21:23:31 +0000 (21:23 +0000)]
Merge "DO NOT MERGE ANYWHERE Don't clear the btsnoop log ringbuffer on compress." into cw-e-dev
Marie Janssen [Wed, 9 Mar 2016 23:31:48 +0000 (15:31 -0800)]
DO NOT MERGE Check size of pin before replying
If a malicious client set a pin that was too long it would overflow
the pin code memory.
Bug:
27411268
Change-Id: I9197ac6fdaa92a4799dacb6364e04671a39450cc
Sharvil Nanavati [Tue, 15 Mar 2016 20:13:45 +0000 (13:13 -0700)]
DO NOT MERGE ANYWHERE Don't send BT+BCC if local device doesn't support codec negotiation.
The current code only checked if the peer supported codec negotiation
before sending AT+BCC. But if codec negotation is disabled on the
local device, we should definitely not send AT+BCC.
Bug:
27213013
Change-Id: Id372a32a61a3d96d5c093bc50594ef0b8c2eff2e
Jacky Cheung [Wed, 2 Mar 2016 23:02:16 +0000 (23:02 +0000)]
Merge "DO NOT MERGE ANYWHERE Default missing DevType and DevClass in NVRAM." into cw-e-dev
Jacky Cheung [Thu, 25 Feb 2016 22:48:12 +0000 (14:48 -0800)]
DO NOT MERGE ANYWHERE Default missing DevType and DevClass in NVRAM.
Missing DevType and DevClass in NVRAM were not properly set to a
default value previously.
Bug:
26825128
Change-Id: Id91898238f15e0e21780eaef99b97a8127ae5b43
Andre Eisenbach [Wed, 2 Mar 2016 03:19:55 +0000 (03:19 +0000)]
DO NOT MERGE Blacklist devices for absolute volume control
am:
8fe9b6c9f7
* commit '
8fe9b6c9f7538de91c1a3aded53518ca8c6d2fc0':
DO NOT MERGE Blacklist devices for absolute volume control
Andre Eisenbach [Fri, 11 Dec 2015 20:32:21 +0000 (12:32 -0800)]
DO NOT MERGE Blacklist devices for absolute volume control
Some devices do not play well with absolute volume control. They either
play back music at unacceptably loud volume levels or provide
insufficiently granular volume control where a single "step" of volume
change results in unexpectedly large jumps in volume.
Bug:
26070064,
26060431
Change-Id: I5a336fba87119325b47a5ad385e9c48a631f2121
Sharvil Nanavati [Tue, 1 Mar 2016 02:13:49 +0000 (18:13 -0800)]
DO NOT MERGE ANYWHERE Sync filesystem after saving a backup of the config file.
Bug:
27292025
Change-Id: Ied3f84157f491dcdf416de211ffbdb45b2abd529
Ajay Panicker [Thu, 11 Feb 2016 20:33:30 +0000 (12:33 -0800)]
DO NOT MERGE ANYWHERE Create backup for bt_config.conf
Move current config file to a backup when a new config file is
saved. This backup can be used in case there is an error loading
the current config file.
Change-Id: Icc210c457dc71a72fc2e82ff72c91207b25deaf1
Sharvil Nanavati [Mon, 29 Feb 2016 23:50:49 +0000 (15:50 -0800)]
DO NOT MERGE ANYWHERE Don't clear the btsnoop log ringbuffer on compress.
Change-Id: I0bf4279104e87b151553eba913491d934f3cde41
Andre Eisenbach [Wed, 24 Feb 2016 18:47:10 +0000 (18:47 +0000)]
Merge "DO NOT MERGE Add ability to add interop entries dynamically (2/2)" into mnc-dr-dev
am:
bd48fd98ad
* commit '
bd48fd98ad78c53365c8354323a7a4e120494e1d':
DO NOT MERGE Add ability to add interop entries dynamically (2/2)
Andre Eisenbach [Wed, 24 Feb 2016 18:35:37 +0000 (18:35 +0000)]
Merge "DO NOT MERGE Add ability to add interop entries dynamically (2/2)" into mnc-dr-dev
Andre Eisenbach [Thu, 14 Jan 2016 10:00:24 +0000 (02:00 -0800)]
DO NOT MERGE Add ability to add interop entries dynamically (2/2)
Add ability and interface for adding dynamic entries to the interop
workaround database.
Bug:
26548845
Change-Id: Id886e4233fc1548727e79f1581cdc0c6f0738d59
Andre Eisenbach [Tue, 23 Feb 2016 23:02:43 +0000 (23:02 +0000)]
DO NOT MERGE Remove Porsche car-kit pairing workaround am:
ed01581886
am:
0befe2bd60
* commit '
0befe2bd60d3c0bc3ba7aa4e4247fb785726c64e':
DO NOT MERGE Remove Porsche car-kit pairing workaround
Andre Eisenbach [Tue, 23 Feb 2016 22:55:32 +0000 (22:55 +0000)]
DO NOT MERGE Remove Porsche car-kit pairing workaround
am:
ed01581886
* commit '
ed01581886db949a8ff6d9178077353e5bc43b5b':
DO NOT MERGE Remove Porsche car-kit pairing workaround
Andre Eisenbach [Thu, 4 Feb 2016 21:19:32 +0000 (13:19 -0800)]
DO NOT MERGE Remove Porsche car-kit pairing workaround
Bug:
26551752
Change-Id: I14c5e3fcda0849874c8a94e48aeb7d09585617e1
Jacky Cheung [Wed, 10 Feb 2016 18:47:46 +0000 (10:47 -0800)]
DO NOT MERGE ANYWHERE Update to use the new log tag for HCI timeout.
Change-Id: I488491aa11a864c46575c0bbfd599bc463f191c8
Sharvil Nanavati [Wed, 10 Feb 2016 02:57:43 +0000 (18:57 -0800)]
DO NOT MERGE ANYWHERE Fix build break caused by duplicate log tag.
Change-Id: Ibb309fdc99ff4f61d04bc6119e1e6d731c1516cb
Jacky Cheung [Thu, 4 Feb 2016 23:26:57 +0000 (15:26 -0800)]
DO NOT MERGE ANYWHERE Add BT_HCI_TIMEOUT log event to track HCI timeouts.
Change-Id: I365e3ccd48d40a215eb5b9fbdbf9ca1556190414
Sharvil Nanavati [Mon, 8 Feb 2016 20:00:25 +0000 (20:00 +0000)]
Merge "Assume input from /dev/stdin if no argument provided to btsnooz.py." into cw-e-dev
Sharvil Nanavati [Sat, 23 Jan 2016 01:03:03 +0000 (17:03 -0800)]
Assume input from /dev/stdin if no argument provided to btsnooz.py.
Change-Id: I54bd137e67eb1fc959663189bcdaac4690c2c645
Victor Tasayco Loarte [Wed, 27 Jan 2016 08:46:18 +0000 (09:46 +0100)]
DO NOT MERGE ANYWHERE implement wakelocks on bt adapter init
Implement wakelocks on bt adapter initialization. This fixes
an issue where the system enters suspend mode while bluetooth
device is initializing. This causes a watchdog time out. Fix
is to acquire a wakelock during this period to avoid entering
suspend mode.
Bug:
26405327
Change-Id: I73202eccd3bce5dff2f6d5b816d5b77579d9484b
Tracked-On: https://jira.ndg.intel.com/browse/MARVIN-1263
Signed-off-by: Jean Ferraton <jean.regisx.ferraton@intel.com>
Sharvil Nanavati [Wed, 27 Jan 2016 17:43:16 +0000 (09:43 -0800)]
DO NOT MERGE ANYWHERE Spoof response to AT+CNUM if we don't get a reply from the audio gateway.
The Huawei Honor 4X CHE1-CL10 phone doesn't reply to AT+CNUM so
we end up disconnecting the service level connection. In this CL,
I'm spoofing an OK response to AT+CNUM in case we time out waiting
for a reply.
Bug:
26504036
Change-Id: I91d5ab4ea91fd67b3f6c6f796c39fd0091bff5cf
Sharvil Nanavati [Wed, 27 Jan 2016 16:22:58 +0000 (16:22 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix return value for HAL function config_clear." into cw-e-dev
Sharvil Nanavati [Tue, 26 Jan 2016 21:09:22 +0000 (13:09 -0800)]
DO NOT MERGE ANYWHERE Fix return value for HAL function config_clear.
Change-Id: I75712f721f7031705d0accb4ffe89467d52d7aa3
Sharvil Nanavati [Tue, 26 Jan 2016 13:29:32 +0000 (13:29 +0000)]
Merge "DO NOT MERGE ANYWHERE Update GKI_freebuf to gracefully handle NULL." into cw-e-dev
Sharvil Nanavati [Sat, 23 Jan 2016 00:54:33 +0000 (16:54 -0800)]
Remove unused definition BOARD_HAVE_BLUETOOTH_BCM.
Change-Id: I4f47ffbec067ad1d7b4db0269cd5f7ee21ae7861
Sharvil Nanavati [Sat, 23 Jan 2016 01:35:07 +0000 (17:35 -0800)]
DO NOT MERGE ANYWHERE Update GKI_freebuf to gracefully handle NULL.
Change-Id: I45a3100c7d5c7a343996559c36f053881d333e5e
Sharvil Nanavati [Wed, 20 Jan 2016 21:07:26 +0000 (21:07 +0000)]
Merge "DO NOT MERGE ANYWHERE" into cw-e-dev
Chenjie Luo [Wed, 20 Jan 2016 21:04:30 +0000 (21:04 +0000)]
Merge "DO NOT MERGE ANYWHERE Disconnect the AVDT connection for A2DP SRC device." into cw-e-dev
WANG XING [Wed, 20 Jan 2016 09:20:39 +0000 (17:20 +0800)]
DO NOT MERGE ANYWHERE Disconnect the AVDT connection for A2DP SRC device.
If phone send A2DP connection request to device, the
device will start 2 seconds timer loop to check the
connection status of A2DP, bluetooth wake
lock will not be released. If the remote device is A2DP
source device, disconnect the AVDT connection.
BUG=
26274393
Change-Id: I3a419e9e3dd613f20c973638b166d2a6012c45f7
Signed-off-by: m00182044 <m00182044@notesmail.huawei.com>
Sharvil Nanavati [Wed, 20 Jan 2016 17:14:47 +0000 (09:14 -0800)]
DO NOT MERGE ANYWHERE
Move btsnooz.py script from Android Wear to the BT stack project.
Change-Id: I8368820b5ed9325d2c3b82885b9fe934c6bc87ca
Sharvil Nanavati [Fri, 15 Jan 2016 21:41:56 +0000 (13:41 -0800)]
DO NOT MERGE ANYWHERE
Update btsnooz log file format to log ACL and SCO headers.
Change-Id: I72db1769197150f34ebba6fcb9c0e3db2404f342
Devin Kim [Thu, 14 Jan 2016 01:37:57 +0000 (10:37 +0900)]
Do not send AT+CHLD=? if the 3-way call feature is not supported
The HF shall not issue the AT+CHLD=? test command in case
either the HF or the AG does not support the Three-way calling feature.
Currently HF sends AT+CHLD=? to AG device when SLC sequence on going.
It affects to SCO statemachine so that after going out of range and
coming back in range while active call alives, SCO state goes bad and
never comes back. This is out of specification of HFP and it should be
fixed by checking peer and local 3way call capability check.
Bug:
25703926
Change-Id: I66adac2345c6fb0df6741fdbfa67d9483fc38a00
Sathya Kumar [Thu, 7 Jan 2016 16:04:56 +0000 (10:04 -0600)]
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links
BUG=
25909971 Xtreme music playback stuttering
Change-Id: I49a2daeb169e7e346d6eb1ede38e6aeb72ed7639
Sharvil Nanavati [Thu, 14 Jan 2016 18:23:08 +0000 (18:23 +0000)]
Merge "Per Motorola, we're going to revert this change and submit Moto-specific code for this." into cw-e-dev
Sharvil Nanavati [Wed, 13 Jan 2016 18:13:39 +0000 (18:13 +0000)]
Per Motorola, we're going to revert this change and submit Moto-specific code for this.
Revert "Disable 3Mbps packets for AVDT ACL links"
This reverts commit
26bb30842b6c64821c2a6c4a515f290140017105.
Change-Id: Iced6b38189b3ef27a6b520bd0af6dd0960e2eb16
Marie Janssen [Tue, 12 Jan 2016 18:53:06 +0000 (18:53 +0000)]
Fix crashes with lots of discovered LE devices am:
05419c8b96
am:
7a5fa57019
* commit '
7a5fa57019c1a0b175adeaa76f7548f6c4a9df6f':
Fix crashes with lots of discovered LE devices
Marie Janssen [Tue, 12 Jan 2016 18:47:46 +0000 (18:47 +0000)]
Fix crashes with lots of discovered LE devices
am:
05419c8b96
* commit '
05419c8b96ff9cf61c257aec6ae0aeabcfcc2636':
Fix crashes with lots of discovered LE devices
Sathya Kumar [Thu, 7 Jan 2016 23:26:05 +0000 (17:26 -0600)]
Disable 3Mbps packets for AVDT ACL links
Change-Id: I4b1b52ec8aeaf5eab0672231889e0ea6f23aa852
Sharvil Nanavati [Wed, 6 Jan 2016 00:23:02 +0000 (16:23 -0800)]
Fix bug where a bonded device could enter BONDING and BONDED states again.
The following sequence of events was observed:
- start bonding with device A
- bond state for A goes from 10 -> 11 -> 12
- everyone's happy
- start bonding with device B
- bond state for B goes from 10 -> 11
- bond state for A goes from 12 -> 11 -> 12
The bond state for A should not have been changed in the last step
since it was not participating in any bonding procedure at the time.
The above sequence can be reproduced if a device D bonds with
A and takes on the slave role and then D bonds with B and switches
to a master role. When D performs the role switch, it receives an
updated link key from A.
Since the link key update procedure is tied in with the pairing flow,
we see spurious bond state changes. This CL checks the pairing control
block to see if D is, in fact, pairing with A and if not, it skips the
bond state updates.
Bug:
25870383
Change-Id: Ic6ff548dbe4e960c965bdc9ef5c50a263b9b3b22
Sharvil Nanavati [Tue, 5 Jan 2016 01:36:43 +0000 (01:36 +0000)]
Merge "Fix crash in HFP client's +COPS parsing code." into cw-e-dev
Sharvil Nanavati [Tue, 5 Jan 2016 01:21:05 +0000 (17:21 -0800)]
Fix crash in HFP client's +COPS parsing code.
If the Audio Gateway sends a malformed +COPS message (an operator
name > 16 characters) then the %n in sscanf format specifier is
ignored and sscanf will not assign a value to the appropriate
argument.
In such a case, the existing code will perform pointer arithmetic
using an uninitialized stack variable as an offset which may result
in pointing to an invalid memory address. When that memory is
subsequently dereferenced, we observe a crash.
This change ensures that the stack does not crash even if an invalid
+COPS message is sent from the Audio Gateway.
Bug:
24871011
Change-Id: I9bb42c75bcd90487831fc6950c571c87098559e7
Sharvil Nanavati [Tue, 5 Jan 2016 01:15:18 +0000 (17:15 -0800)]
Only send first 16 characters of operator name in +COPS.
According to the HFP spec, the operator name is required to be at
most 16 characters long.
Bug:
24871011
Change-Id: I9987de57a327348fc2203b9502e9df446a87793f
Marie Janssen [Wed, 9 Dec 2015 18:08:25 +0000 (10:08 -0800)]
Fix crashes with lots of discovered LE devices
When loads of devices are discovered a config file which is too large
can be written out, which causes the BT daemon to crash on startup.
This limits the number of config entries for unpaired devices which
are initialized, and prevents a large number from being saved to the
filesystem.
Bug:
26071376
Change-Id: I4a74094f57a82b17f94e99a819974b8bc8082184
(cherry picked from commit
d77f1999ecece56c1cbb333f4ddc26f0b5bac2c5)
Sharvil Nanavati [Fri, 18 Dec 2015 01:58:36 +0000 (01:58 +0000)]
Merge "Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false" into cw-e-dev
Scott James Remnant [Wed, 11 Nov 2015 19:51:20 +0000 (11:51 -0800)]
DO NOT MERGE ANYWHERE net_test_bluetooth: replace with gtest variant
Bug:
25385380
Change-Id: Ia719363823d8d538caa6b42f076d5d6d737ae036
Joshua Schwarz [Thu, 17 Dec 2015 22:47:38 +0000 (22:47 +0000)]
Merge "DO NOT MERGE ANYWHERE Rename gtest_net_test_bluedroid to gtest_net_test_bluetooth." into cw-e-dev
Sharvil Nanavati [Thu, 17 Dec 2015 14:23:19 +0000 (06:23 -0800)]
Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false
Without this change, setting AVRC_ADV_CTRL_INCLUDED to false would
result in the native code reporting the remote device supports
absolute volume even though we don't.
Bug:
26070064
Change-Id: I5b88fa0adb89983de28a216898a1d8957fa454a1
Devin Kim [Thu, 3 Dec 2015 21:19:20 +0000 (13:19 -0800)]
Fix BT connection failures
When HFP connection failed establishing between phone and watch, it can't
recover RFCOMM status which causes that HFP connection will not be made
unless BT radio goes off and comes back on. RFCOMM and HFP both trying to
open RFCOMM control channel at nearly same time, at some point, there's
a possibility that SABM packet didn't reach out to BT controller to connect
to phone from watch with HFP while phone tries to connect to watch with
AW RFCOMM.
This will take care of pending SABM packet to reach out to controller
properly so that RFCOMM status will not be messed.
Bug:
24285000
Bug:
25579482
Bug:
25579423
Bug:
25578997
Change-Id: Icc26b86c644ebd8d1c12a2fb4e94d04ba16cc2dd
Alain Vongsouvanh [Wed, 9 Dec 2015 16:57:38 +0000 (08:57 -0800)]
DO NOT MERGE ANYWHERE: osi: Remove error_fclose goto and redundant fflush.
Change-Id: I327f9ce696bb68eb3b89b4a8b15dba189e027970
Amadeusz Slawinski [Tue, 3 Nov 2015 15:09:57 +0000 (16:09 +0100)]
DO NOT MERGE ANYWHERE: Add file write error checks to config_save
It's better to leave old config file instead of
overwriting with broken one.
Fixes problem when disk is full and we can't write
more data to it.
(Change amended to use "old" style LOG_ERROR macro)
Issue: KIONE-3099
Change-Id: Ifdb641ba7f3140655f9ec371e53b11a17484f27a
Joshua Schwarz [Mon, 30 Nov 2015 16:44:26 +0000 (08:44 -0800)]
DO NOT MERGE ANYWHERE Rename gtest_net_test_bluedroid to gtest_net_test_bluetooth.
Change-Id: I73105164c04701aade27638ffdc5c3281a2585a2
Zach Johnson [Wed, 2 Dec 2015 18:20:03 +0000 (18:20 +0000)]
Merge "Mark secure link as authenticated for LE" into cw-e-dev
Andre Eisenbach [Sat, 14 Nov 2015 00:48:53 +0000 (16:48 -0800)]
Mark secure link as authenticated for LE
Without this change, reading an authenticated GATT characteristic using
BR/EDR would fail with an insufficient authentication error.
Change-Id: I02f44cdf90635b470b21e8aad8240993cb0e8e42
Sridhar Vashist [Fri, 7 Aug 2015 00:40:24 +0000 (19:40 -0500)]
Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE.
There appear to be race cases where the peer sends a START before
we reconfigure the stream. Avoid btif_av state from getting
mismatched by always sending out the SUSPEND_CFM during RECONFIGURE.
Change-Id: I2034cd111466f792233cedb60a3a0df11d055962
Signed-off-by: Sridhar Vashist <svashist@motorola.com>
Sridhar Vashist [Wed, 14 Oct 2015 22:47:02 +0000 (17:47 -0500)]
Make default SBC bitrate configurable by device.
Configurable default SBC bitrate so that audio quality can be maintained
for sampling rates other than 44.1kHz
Change-Id: Ia4197c0a500088cfa48a8ba821e9738a16c3fc6e
Signed-off-by: Sridhar Vashist <svashist@motorola.com>
Chris Elliott [Tue, 1 Dec 2015 21:09:52 +0000 (21:09 +0000)]
Merge "A2DP SRC offload support" into cw-e-dev
Abhijit Adsule [Tue, 19 May 2015 07:44:26 +0000 (02:44 -0500)]
A2DP SRC offload support
bluedroid changes to support A2DP SRC offload to BT FW.
add functionality to relay a2dp offload requests and responses
between AudioHAL & the BT vendor library.
Change-Id: Ie4e5992c48e95b0efb372a405e8537e4fd3ea071
Signed-off-by: Sridhar Vashist <svashist@motorola.com>
Conflicts:
audio_a2dp_hw/audio_a2dp_hw.h
bta/Android.mk
bta/av/bta_av_aact.c
btif/include/btif_media.h
btif/src/btif_av.c
btif/src/btif_media_task.c
hci/Android.mk
hci/src/vendor.c
include/bt_target.h
stack/include/l2c_api.h
Chenjie Luo [Fri, 20 Nov 2015 19:18:42 +0000 (11:18 -0800)]
Only initiate codec negotiation if feature is supported
Bug:
25634250
Change-Id: I97330c853f6cf90673b4ff28c72645f9d1c8ff9d
Sharvil Nanavati [Mon, 9 Nov 2015 17:11:12 +0000 (17:11 +0000)]
Merge "Fix broken test caused by misordered callback arguments." into cw-e-dev
Sharvil Nanavati [Sat, 7 Nov 2015 10:12:16 +0000 (02:12 -0800)]
Fix broken test caused by misordered callback arguments.
Change-Id: I16976a2a680eab76af31090548c2efc53bebaa60
Andre Eisenbach [Fri, 6 Nov 2015 00:59:44 +0000 (00:59 +0000)]
Always update remote address type during LE scan
am:
03d171170c
* commit '
03d171170c7ad4e40454a9575cfd4919d2e1ef2f':
Always update remote address type during LE scan
Andre Eisenbach [Thu, 5 Nov 2015 23:38:36 +0000 (15:38 -0800)]
Always update remote address type during LE scan
This will ensure that devices which do not contain a device name in the
advertising record are stored with the correct address type to ensure
re-connection to the device succeeds.
Bug:
25499163
Change-Id: I85f18ce2de267844c5d5ed49beeb448b9b074d74
Andre Eisenbach [Thu, 5 Nov 2015 01:27:19 +0000 (01:27 +0000)]
Merge "Do not mask out secure connections (SC) bit for BT <4.2" into mnc-dr-dev
am:
15c1f685db
* commit '
15c1f685db0453a3e20f81de94fca7040a52a39a':
Do not mask out secure connections (SC) bit for BT <4.2