OSDN Git Service
Sharvil Nanavati [Wed, 22 Jun 2016 01:16:24 +0000 (01:16 +0000)]
resolve merge conflicts of
1f433cb to mnc-dr-dev am:
f15ca6d21d -s ours
am:
8e80a26078
Change-Id: I54a690024ccd316058d9d59ff7b16206f7fcd543
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:13:00 +0000 (22:13 +0000)]
Merge "Add guest mode functionality (2/3)" into mnc-dev am:
4439d380e5 am:
99bbe2fffe -s ours
am:
34619f8e30
* commit '
34619f8e30adb98a2a605665b02df16a9fda6032':
Add guest mode functionality (2/3)
Change-Id: I00a7ad9675ba8e3f68e2066aca2fd1a5baaf06db
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 [Tue, 17 May 2016 23:42:42 +0000 (23:42 +0000)]
DO NOT MERGE ANYWHERE Restart failed system calls interrupted with errno of EINTR
am:
f9a4d9e8bf -s ours
* commit '
f9a4d9e8bf63b006bec9c30f6dc430ac5d30a85b':
DO NOT MERGE ANYWHERE Restart failed system calls interrupted with errno of EINTR
Change-Id: I982345259966a2d7108a6a9699b3f71cb6d2e26f
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 18:02:02 +0000 (18:02 +0000)]
DO NOT MERGE btif: check overflow on create_pbuf size am:
ad31ee0f0f am:
d47ab963e1
am:
6f6949ff93
* commit '
6f6949ff93d3e370cf72b0e18673a7749bfdfa0f':
DO NOT MERGE btif: check overflow on create_pbuf size
Change-Id: I1ed5ea4b978e5f9b6628a5443a0acc3e61c297d7
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 [Thu, 12 May 2016 18:38:06 +0000 (18:38 +0000)]
DO NOT MERGE ANYWHERE SMP: Delay authorization complete.
am:
8c519caec3 -s ours
* commit '
8c519caec3908ce20832ce4c756f2514158da132':
DO NOT MERGE ANYWHERE SMP: Delay authorization complete.
Change-Id: I1dbfbc0b3f5cddecd18f604f5d4d0271777ce02a
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 19:01:31 +0000 (19:01 +0000)]
DO NOT MERGE ANYWHERE Fix double mutex unlock and if() condition
am:
d7ec6c9c59 -s ours
* commit '
d7ec6c9c59aab205a1e90fd1db3f98431e983dfd':
DO NOT MERGE ANYWHERE Fix double mutex unlock and if() condition
Change-Id: Ida3953705286386634d27d00ceef540090ecc533
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 20:07:04 +0000 (13:07 -0700)]
resolve merge conflicts of
d266361 to mnc-dr1.5-dev
Change-Id: If3b37b4cd7287ccb973b508f4911f2c2bcdbcfb2
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 [Tue, 12 Apr 2016 17:40:08 +0000 (17:40 +0000)]
DO NOT MERGE ANYWHERE Do not update sco_state when no matching peer_addr is found
am:
5130f53 -s ours
* commit '
5130f53a3c5be77c022a34c5cc8eb90868fa5647':
DO NOT MERGE ANYWHERE Do not update sco_state when no matching peer_addr is found
Change-Id: I7bd6b444e1bafe7103af5874ca235133c7a33ff1
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:19:49 +0000 (20:19 +0000)]
Merge "DO NOT MERGE ANYWHERE Bring back support for legacy bt_config.xml" into cw-e-dev
am:
debb9bf -s ours
* commit '
debb9bfc106a9e8085568f56f9656185f969618e':
DO NOT MERGE ANYWHERE Bring back support for legacy bt_config.xml
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
Zhao Xuewen [Fri, 25 Mar 2016 20:09:13 +0000 (20:09 +0000)]
DO NOT MERGE ANYWHERE Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect.
am:
7cd14dc -s ours
* commit '
7cd14dc671caf13070756d27dea92f85fe6711f1':
DO NOT MERGE ANYWHERE Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect.
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:48:19 +0000 (20:48 +0000)]
DO NOT MERGE Check size of pin before replying am:
f0a69c3 am:
d016a5e
am:
0c841c8
* commit '
0c841c8a4c0dbf780c59c7144e612b3e450ce933':
DO NOT MERGE Check size of pin before replying
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:31:24 +0000 (21:31 +0000)]
Merge "DO NOT MERGE ANYWHERE Don\'t clear the btsnoop log ringbuffer on compress." into cw-e-dev
am:
32e0b11 -s ours
* commit '
32e0b1129eddff87cdd1843fcb79e34f34ab7230':
DO NOT MERGE ANYWHERE Don't clear the btsnoop log ringbuffer on compress.
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 23:22:44 +0000 (23:22 +0000)]
DO NOT MERGE ANYWHERE Don\'t send BT+BCC if local device doesn\'t support codec negotiation.
am:
ef192019f8 -s ours
* commit '
ef192019f8a289b6ecf1a86d33377d44df7f27c5':
DO NOT MERGE ANYWHERE Don't send BT+BCC if local device doesn't support codec negotiation.
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:10:20 +0000 (23:10 +0000)]
Merge "DO NOT MERGE ANYWHERE Default missing DevType and DevClass in NVRAM." into cw-e-dev
am:
ce1b1a6ac4 -s ours
* commit '
ce1b1a6ac4ff4c42919afbb75eb6ab42d57c588e':
DO NOT MERGE ANYWHERE Default missing DevType and DevClass in NVRAM.
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
Andre Eisenbach [Wed, 2 Mar 2016 18:51:59 +0000 (18:51 +0000)]
DO NOT MERGE Blacklist devices for absolute volume control am:
8fe9b6c9f7
am:
ef43e49660 -s ours
* commit '
ef43e49660c78f8ffd19f98b87ca7c4e2d682958':
DO NOT MERGE Blacklist devices for absolute volume control
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
Sharvil Nanavati [Wed, 2 Mar 2016 02:31:40 +0000 (02:31 +0000)]
DO NOT MERGE ANYWHERE Sync filesystem after saving a backup of the config file.
am:
b51ad9de6a -s ours
* commit '
b51ad9de6ab1e2cab848943f9d10e465d06e7b4c':
DO NOT MERGE ANYWHERE Sync filesystem after saving a backup of the config file.
Ajay Panicker [Wed, 2 Mar 2016 02:31:36 +0000 (02:31 +0000)]
DO NOT MERGE ANYWHERE Create backup for bt_config.conf
am:
4d5f21452e -s ours
* commit '
4d5f21452e6bcbac52defa86fd9cc8455a841ce4':
DO NOT MERGE ANYWHERE Create backup for bt_config.conf
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:53:36 +0000 (18:53 +0000)]
Merge "DO NOT MERGE Add ability to add interop entries dynamically (2/2)" into mnc-dr-dev am:
bd48fd98ad
am:
9c32e564df
* commit '
9c32e564df9dda1dd99d5c68d21404934a61acd9':
DO NOT MERGE Add ability to add interop entries dynamically (2/2)
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:09:36 +0000 (23:09 +0000)]
DO NOT MERGE Remove Porsche car-kit pairing workaround am:
ed01581886 am:
0befe2bd60
am:
f87612c768
* commit '
f87612c7687c884b35c603b8f487f8c68255f28a':
DO NOT MERGE Remove Porsche car-kit pairing workaround
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 [Thu, 18 Feb 2016 18:17:51 +0000 (18:17 +0000)]
DO NOT MERGE ANYWHERE Update to use the new log tag for HCI timeout.
am:
3bdb1d48d0 -s ours
* commit '
3bdb1d48d0390d48279db942f4267aa3f4126c29':
DO NOT MERGE ANYWHERE Update to use the new log tag for HCI timeout.
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 03:49:25 +0000 (03:49 +0000)]
DO NOT MERGE ANYWHERE Fix build break caused by duplicate log tag.
am:
8dc3dfc2e7 -s ours
* commit '
8dc3dfc2e73b7a86d071bf5194a7b3842ece8cdc':
DO NOT MERGE ANYWHERE Fix build break caused by duplicate log tag.
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 [Wed, 10 Feb 2016 01:30:20 +0000 (01:30 +0000)]
DO NOT MERGE ANYWHERE Add BT_HCI_TIMEOUT log event to track HCI timeouts.
am:
5a362a2f14 -s ours
* commit '
5a362a2f1444756e675f72ace44fae7290254117':
DO NOT MERGE ANYWHERE Add BT_HCI_TIMEOUT log event to track HCI timeouts.
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:20:51 +0000 (20:20 +0000)]
Merge "Assume input from /dev/stdin if no argument provided to btsnooz.py." into cw-e-dev
am:
853ca86427 -s ours
* commit '
853ca864272a21e48c257b8c021ee4ad3ffdf58d':
Assume input from /dev/stdin if no argument provided to btsnooz.py.
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 [Fri, 29 Jan 2016 00:46:44 +0000 (00:46 +0000)]
DO NOT MERGE ANYWHERE implement wakelocks on bt adapter init
am:
ef1f356866 -s ours
* commit '
ef1f3568666355463fa62c8f179a6043b7dd2413':
DO NOT MERGE ANYWHERE implement wakelocks on bt adapter init
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 [Thu, 28 Jan 2016 18:03:57 +0000 (18:03 +0000)]
DO NOT MERGE ANYWHERE Spoof response to AT+CNUM if we don\'t get a reply from the audio gateway.
am:
529a69c8e8 -s ours
* commit '
529a69c8e83d843c683b99e32f8990c217f96c79':
DO NOT MERGE ANYWHERE Spoof response to AT+CNUM if we don't get a reply from the audio gateway.
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:23:58 +0000 (16:23 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix return value for HAL function config_clear." into cw-e-dev
am:
f1f9523db0 -s ours
* commit '
f1f9523db05854aa4dc5c44087b1e4228ae87ab6':
DO NOT MERGE ANYWHERE Fix return value for HAL function config_clear.
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:31:04 +0000 (13:31 +0000)]
Merge "DO NOT MERGE ANYWHERE Update GKI_freebuf to gracefully handle NULL." into cw-e-dev
am:
e3aabcbbf5 -s ours
* commit '
e3aabcbbf5b9c3108b980ec161b2cef614416138':
DO NOT MERGE ANYWHERE Update GKI_freebuf to gracefully handle NULL.
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
Andre Eisenbach [Mon, 25 Jan 2016 13:41:05 +0000 (13:41 +0000)]
Merge "Additional headsets blacklisted for absolute volume" into mnc-dr1.5-dev
Sharvil Nanavati [Sat, 23 Jan 2016 01:47:23 +0000 (01:47 +0000)]
Remove unused definition BOARD_HAVE_BLUETOOTH_BCM.
am:
ad46ee235f
* commit '
ad46ee235fa0828ebf4042d84f646424ffeadc31':
Remove unused definition BOARD_HAVE_BLUETOOTH_BCM.
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
tturney [Thu, 21 Jan 2016 18:19:22 +0000 (10:19 -0800)]
Additional headsets blacklisted for absolute volume
Devices blacklisted:
Bluebuds Freedom
iKross
Jabra
Swage Rokitboost HS
Bug:
26070064
Change-Id: Ic27d225718b84234541bf1b170f94dea0bc4463c
Sharvil Nanavati [Wed, 20 Jan 2016 21:10:25 +0000 (21:10 +0000)]
Merge "DO NOT MERGE ANYWHERE" into cw-e-dev
am:
560033035b -s ours
* commit '
560033035b58014aed67701cb3b94b0a98f5c958':
DO NOT MERGE ANYWHERE
Chenjie Luo [Wed, 20 Jan 2016 21:10:20 +0000 (21:10 +0000)]
Merge "DO NOT MERGE ANYWHERE Disconnect the AVDT connection for A2DP SRC device." into cw-e-dev
am:
5084f0166e -s ours
* commit '
5084f0166ee0ee20608413a79c88332275b61943':
DO NOT MERGE ANYWHERE Disconnect the AVDT connection for A2DP SRC device.
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 [Wed, 20 Jan 2016 04:31:38 +0000 (04:31 +0000)]
DO NOT MERGE ANYWHERE
am:
95f816945a -s ours
* commit '
95f816945a174f890b960330445087c3409f3327':
DO NOT MERGE ANYWHERE
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 [Fri, 15 Jan 2016 18:05:14 +0000 (18:05 +0000)]
Do not send AT+CHLD=? if the 3-way call feature is not supported
am:
79dc36d01a
* commit '
79dc36d01aaab9a29cd70a0ff40463102505da4b':
Do not send AT+CHLD=? if the 3-way call feature is not supported
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 [Fri, 15 Jan 2016 01:45:17 +0000 (01:45 +0000)]
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links
am:
a8bb3ae08b -s ours
* commit '
a8bb3ae08b6696e7931c903bf11f54b743d37acf':
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links
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 19:59:33 +0000 (11:59 -0800)]
resolve merge conflicts of
7408acb7be to mnc-dr1.5-dev.
Change-Id: I5f00746e95c703da91838395aa0c85a660cef2b1
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
Pankaj Kanwar [Wed, 13 Jan 2016 22:33:01 +0000 (22:33 +0000)]
Merge "Offload config save functionality to BTIF thread" into mnc-dr1.5-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
Srinu Jella [Thu, 24 Dec 2015 12:10:52 +0000 (17:40 +0530)]
Offload config save functionality to BTIF thread
Offload config save functionality to btif thread from
timer thread as timer callback thread is critical in
a2dp playback case.
If the timer callback thread is busy in config save due
to IO operations, it may lead to a2dp audio choppy.
Fix to avoid the "bt_config.conf" file corruption from
the file system. This will avoid losing the paired
information in some corner case, such as abrupt power
off and on. This patch will ensure bt_config is saved to
NVRAM.
Bug:
24875861
CRs-Fixed: 953993
Change-Id: I893e9afefa89cbab6e7ddd8835ca77d3e316874c
Andre Eisenbach [Tue, 12 Jan 2016 19:30:55 +0000 (19:30 +0000)]
Merge "Additional headsets blacklisted for absolute volume" into mnc-dr1.5-dev
Marie Janssen [Tue, 12 Jan 2016 18:56:56 +0000 (18:56 +0000)]
Fix crashes with lots of discovered LE devices am:
05419c8b96 am:
7a5fa57019
am:
0ff343e006
* commit '
0ff343e0067c77341a86b0cd4491081cb66657cd':
Fix crashes with lots of discovered LE devices
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
OSDN Git Service
