OSDN Git Service
Marie Janssen [Tue, 10 May 2016 15:42:11 +0000 (15:42 +0000)]
DO NOT MERGE Check size of pin before replying am:
f0a69c3 am:
d016a5e am:
0c841c8 am:
9d8e2f6a49 -s ours
am:
6247e0b28f
* commit '
6247e0b28f668d141e7b009265f386f3e0e4ebe3':
DO NOT MERGE Check size of pin before replying
Change-Id: I1cd5fb4d4a3dd558b1407a12c8978220987bb378
Sharvil Nanavati [Tue, 10 May 2016 15:42:09 +0000 (15:42 +0000)]
Merge "DO NOT MERGE ANYWHERE Don\'t clear the btsnoop log ringbuffer on compress." into cw-e-dev am:
32e0b11 -s ours am:
9a9a088761 -s ours
am:
0356f46f18 -s ours
* commit '
0356f46f18c8e31b9d475914fcf91daae5a6bee1':
DO NOT MERGE ANYWHERE Don't clear the btsnoop log ringbuffer on compress.
Change-Id: I89f9b0bdba5088df40d8b7766ce2ad9372e2d8dc
Sharvil Nanavati [Tue, 10 May 2016 15:42:08 +0000 (15:42 +0000)]
DO NOT MERGE ANYWHERE Don\'t send BT+BCC if local device doesn\'t support codec negotiation. am:
ef192019f8 -s ours am:
4498648ede -s ours
am:
365a0d402a -s ours
* commit '
365a0d402a1602eaa9a2f0a15d7b425d0432a804':
DO NOT MERGE ANYWHERE Don't send BT+BCC if local device doesn't support codec negotiation.
Change-Id: Iae6365a4f2283aa8fd93adb8df919b46348a92ba
Jacky Cheung [Tue, 10 May 2016 15:40:21 +0000 (15:40 +0000)]
Merge "DO NOT MERGE ANYWHERE Default missing DevType and DevClass in NVRAM." into cw-e-dev am:
ce1b1a6ac4 -s ours am:
c28ef1474c -s ours
am:
2b460c41e1 -s ours
* commit '
2b460c41e1e890db72bb3b80b4f80618fe684d86':
DO NOT MERGE ANYWHERE Default missing DevType and DevClass in NVRAM.
Change-Id: I005f335e0dec144a0a2eeda91192fdde48d03795
Andre Eisenbach [Tue, 10 May 2016 15:40:20 +0000 (15:40 +0000)]
DO NOT MERGE Blacklist devices for absolute volume control am:
8fe9b6c9f7 am:
ef43e49660 -s ours am:
95a2c10363 -s ours
am:
4c2d25d1a1
* commit '
4c2d25d1a132f8391b5268fe3bcd40096736b7a6':
DO NOT MERGE Blacklist devices for absolute volume control
Change-Id: I43a964adafd98663b322e51899820fbffcd7c5a9
Sharvil Nanavati [Tue, 10 May 2016 15:40:20 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE Sync filesystem after saving a backup of the config file. am:
b51ad9de6a -s ours am:
fbe8c67b7d -s ours
am:
10be3e51ac -s ours
* commit '
10be3e51ac037cd167d7a28f0883dde64c3a7406':
DO NOT MERGE ANYWHERE Sync filesystem after saving a backup of the config file.
Change-Id: Idb4cff745ee30aeff8c8f921a6494e1220fae603
Ajay Panicker [Tue, 10 May 2016 15:40:19 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE Create backup for bt_config.conf am:
4d5f21452e -s ours am:
033c59192c -s ours
am:
7e52eeede7 -s ours
* commit '
7e52eeede7d171053047b802ad4404178643b30e':
DO NOT MERGE ANYWHERE Create backup for bt_config.conf
Change-Id: I26c9245cd78967306ea2ff41eeec3ca7d5cc9d6d
Andre Eisenbach [Tue, 10 May 2016 15:40:18 +0000 (15:40 +0000)]
Merge "DO NOT MERGE Add ability to add interop entries dynamically (2/2)" into mnc-dr-dev am:
bd48fd98ad am:
9c32e564df am:
1c3f2f19e6 -s ours
am:
a72dc32ec8
* commit '
a72dc32ec8381be813857d7b8f40dd1cecd857ca':
DO NOT MERGE Add ability to add interop entries dynamically (2/2)
Change-Id: I811c3e0281e19685b5b7cf364a141aee083c8f3f
Andre Eisenbach [Tue, 10 May 2016 15:40:17 +0000 (15:40 +0000)]
DO NOT MERGE Remove Porsche car-kit pairing workaround am:
ed01581886 am:
0befe2bd60 am:
f87612c768 am:
67cbb3f146 -s ours
am:
03525d90d0
* commit '
03525d90d07308474c9e67514e02924128234ee7':
DO NOT MERGE Remove Porsche car-kit pairing workaround
Change-Id: I2f3e43f7ba258a72a5b1d062a7a13356019217ef
Jacky Cheung [Tue, 10 May 2016 15:40:16 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE Update to use the new log tag for HCI timeout. am:
3bdb1d48d0 -s ours am:
9784748d28 -s ours
am:
1fc58f22b5 -s ours
* commit '
1fc58f22b591cfcc5f1ced99184dfade9f3c822a':
DO NOT MERGE ANYWHERE Update to use the new log tag for HCI timeout.
Change-Id: Iba6e1edfa14f8ce5190f9ca291937820e00c0161
Sharvil Nanavati [Tue, 10 May 2016 15:40:14 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE Fix build break caused by duplicate log tag. am:
8dc3dfc2e7 -s ours am:
1e93a64272 -s ours
am:
42a6b5f5a2 -s ours
* commit '
42a6b5f5a222a03dc3cec12e6691c4ef429f2e6e':
DO NOT MERGE ANYWHERE Fix build break caused by duplicate log tag.
Change-Id: Ib6d6c437fb27a61b6d0a0fee16e3036bf5f7aa85
Jacky Cheung [Tue, 10 May 2016 15:40:12 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE Add BT_HCI_TIMEOUT log event to track HCI timeouts. am:
5a362a2f14 -s ours am:
3ecd1121d1 -s ours
am:
6e7a5f00d0 -s ours
* commit '
6e7a5f00d045155709525032851d6aef42f822c0':
DO NOT MERGE ANYWHERE Add BT_HCI_TIMEOUT log event to track HCI timeouts.
Change-Id: I54e59614abd243b562f6d9b1fa335dd90ff8637b
Sharvil Nanavati [Tue, 10 May 2016 15:40:11 +0000 (15:40 +0000)]
Merge "Assume input from /dev/stdin if no argument provided to btsnooz.py." into cw-e-dev am:
853ca86427 -s ours am:
a3ed438701
am:
db4e9beabd
* commit '
db4e9beabd694f5ba78c5108579d42a975653611':
Assume input from /dev/stdin if no argument provided to btsnooz.py.
Change-Id: I9eea4295c123d2ed6ba8f35ef45577e45a9b13b5
Victor Tasayco Loarte [Tue, 10 May 2016 15:40:09 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE implement wakelocks on bt adapter init am:
ef1f356866 -s ours am:
86ccba4678 -s ours
am:
4e9764fdf4 -s ours
* commit '
4e9764fdf4630a218d153c2ccda539bca01a625f':
DO NOT MERGE ANYWHERE implement wakelocks on bt adapter init
Change-Id: I3d7bce5bc58351b98e4026d08d33eed892855f52
Sharvil Nanavati [Tue, 10 May 2016 15:40:07 +0000 (15:40 +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 am:
9073d039b1 -s ours
am:
ea0dc3c653 -s ours
* commit '
ea0dc3c6539ae83876926e938b4f3d65df16d204':
DO NOT MERGE ANYWHERE Spoof response to AT+CNUM if we don't get a reply from the audio gateway.
Change-Id: I3249341dd9ae59a26f5b31ae5165ff3291edc8f3
Sharvil Nanavati [Tue, 10 May 2016 15:40:04 +0000 (15:40 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix return value for HAL function config_clear." into cw-e-dev am:
f1f9523db0 -s ours am:
87912b8170 -s ours
am:
10d34bedf6 -s ours
* commit '
10d34bedf663856b48931da58e7ff5a131d7af39':
DO NOT MERGE ANYWHERE Fix return value for HAL function config_clear.
Change-Id: I660c2dfb85accfc43a38c29efee78c301d4ed33b
Sharvil Nanavati [Tue, 10 May 2016 15:40:02 +0000 (15:40 +0000)]
Merge "DO NOT MERGE ANYWHERE Update GKI_freebuf to gracefully handle NULL." into cw-e-dev am:
e3aabcbbf5 -s ours am:
9844f6c5dd -s ours
am:
7dbccaa5c7 -s ours
* commit '
7dbccaa5c789aeb5d92d0109f0bd78387846273a':
DO NOT MERGE ANYWHERE Update GKI_freebuf to gracefully handle NULL.
Change-Id: I3ba1d0e7bed0fa3911595857d29d9e440e97b7cb
Andre Eisenbach [Tue, 10 May 2016 15:40:00 +0000 (15:40 +0000)]
Merge "Additional headsets blacklisted for absolute volume" into mnc-dr1.5-dev am:
8c0745ad21 -s ours
am:
b5e366d111
* commit '
b5e366d111beef15fd13455286c40aae7f105ab0':
Additional headsets blacklisted for absolute volume
Change-Id: Icc3fe2e3fdf726a8cc5d861cfa18e2d35f718bb4
Marie Janssen [Tue, 10 May 2016 15:38:54 +0000 (15:38 +0000)]
DO NOT MERGE Check size of pin before replying am:
f0a69c3 am:
d016a5e am:
0c841c8
am:
9d8e2f6a49 -s ours
* commit '
9d8e2f6a498b966db73f45c5098e8dd13133d0d6':
DO NOT MERGE Check size of pin before replying
Change-Id: I87d3d4a73e309a0e4989c2cf53e9f78c54b0e6e6
Sharvil Nanavati [Tue, 10 May 2016 15:38:53 +0000 (15:38 +0000)]
Merge "DO NOT MERGE ANYWHERE Don\'t clear the btsnoop log ringbuffer on compress." into cw-e-dev am:
32e0b11 -s ours
am:
9a9a088761 -s ours
* commit '
9a9a08876151ca871ea15f2bde1f3d6d688e67f5':
DO NOT MERGE ANYWHERE Don't clear the btsnoop log ringbuffer on compress.
Change-Id: I4e11dc5ea337ac178a494d565512ebdcc9691caf
Sharvil Nanavati [Tue, 10 May 2016 15:37:39 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Don\'t send BT+BCC if local device doesn\'t support codec negotiation. am:
ef192019f8 -s ours
am:
4498648ede -s ours
* commit '
4498648ede31cea4858322620587c8da7ea0d1ac':
DO NOT MERGE ANYWHERE Don't send BT+BCC if local device doesn't support codec negotiation.
Change-Id: I78985b37be61d5fe21179021e3372534290ae6b9
Jacky Cheung [Tue, 10 May 2016 15:37:39 +0000 (15:37 +0000)]
Merge "DO NOT MERGE ANYWHERE Default missing DevType and DevClass in NVRAM." into cw-e-dev am:
ce1b1a6ac4 -s ours
am:
c28ef1474c -s ours
* commit '
c28ef1474c240fb38aa1ec177d3ad174b33f2828':
DO NOT MERGE ANYWHERE Default missing DevType and DevClass in NVRAM.
Change-Id: I03070dbd437422fdb788cba1e09e0fd417259210
Andre Eisenbach [Tue, 10 May 2016 15:37:38 +0000 (15:37 +0000)]
DO NOT MERGE Blacklist devices for absolute volume control am:
8fe9b6c9f7 am:
ef43e49660 -s ours
am:
95a2c10363 -s ours
* commit '
95a2c10363cb93d1572cfb32df990f2fcf2163d6':
DO NOT MERGE Blacklist devices for absolute volume control
Change-Id: Ifa7be865da2a007843520781fea59d43a0bc77d7
Sharvil Nanavati [Tue, 10 May 2016 15:37:38 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Sync filesystem after saving a backup of the config file. am:
b51ad9de6a -s ours
am:
fbe8c67b7d -s ours
* commit '
fbe8c67b7d576433edfdc73422b2360281dd49e8':
DO NOT MERGE ANYWHERE Sync filesystem after saving a backup of the config file.
Change-Id: Iaa96e0146923ebd79b2a00854e33467c4d857657
Ajay Panicker [Tue, 10 May 2016 15:37:37 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Create backup for bt_config.conf am:
4d5f21452e -s ours
am:
033c59192c -s ours
* commit '
033c59192c6ab35daacb0da35819ffeb92f30ae9':
DO NOT MERGE ANYWHERE Create backup for bt_config.conf
Change-Id: I48a7bdbc3808eb8edfbba66662606820bb1d8e7c
Andre Eisenbach [Tue, 10 May 2016 15:37:36 +0000 (15:37 +0000)]
Merge "DO NOT MERGE Add ability to add interop entries dynamically (2/2)" into mnc-dr-dev am:
bd48fd98ad am:
9c32e564df
am:
1c3f2f19e6 -s ours
* commit '
1c3f2f19e616ea34978521d5eafaf1f387b2acef':
DO NOT MERGE Add ability to add interop entries dynamically (2/2)
Change-Id: Ie85400020a1c270f9629363a437a264730a27a84
Andre Eisenbach [Tue, 10 May 2016 15:37:36 +0000 (15:37 +0000)]
DO NOT MERGE Remove Porsche car-kit pairing workaround am:
ed01581886 am:
0befe2bd60 am:
f87612c768
am:
67cbb3f146 -s ours
* commit '
67cbb3f1468aa29ba1a605cf8540a8ed2f0ede8b':
DO NOT MERGE Remove Porsche car-kit pairing workaround
Change-Id: If6ad12cadb4a4869b439fb2fcb5e88df32d00111
Jacky Cheung [Tue, 10 May 2016 15:37:35 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Update to use the new log tag for HCI timeout. am:
3bdb1d48d0 -s ours
am:
9784748d28 -s ours
* commit '
9784748d287e66e8442d642794d2a181ba79031d':
DO NOT MERGE ANYWHERE Update to use the new log tag for HCI timeout.
Change-Id: I86410cc4cd914ba8620d29af063b90545d89a88b
Sharvil Nanavati [Tue, 10 May 2016 15:37:34 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Fix build break caused by duplicate log tag. am:
8dc3dfc2e7 -s ours
am:
1e93a64272 -s ours
* commit '
1e93a642725a5411af0bc0bbf95b6712ef05fbed':
DO NOT MERGE ANYWHERE Fix build break caused by duplicate log tag.
Change-Id: I4ac25f2d4014d8e14aa5a2872add31f075d2cdde
Jacky Cheung [Tue, 10 May 2016 15:37:33 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Add BT_HCI_TIMEOUT log event to track HCI timeouts. am:
5a362a2f14 -s ours
am:
3ecd1121d1 -s ours
* commit '
3ecd1121d131141070b7395bb849af29d01c18db':
DO NOT MERGE ANYWHERE Add BT_HCI_TIMEOUT log event to track HCI timeouts.
Change-Id: I9f6f5c11dc0cb14b383c644bf56db63e8b2877b6
Sharvil Nanavati [Tue, 10 May 2016 15:37:32 +0000 (15:37 +0000)]
Merge "Assume input from /dev/stdin if no argument provided to btsnooz.py." into cw-e-dev am:
853ca86427 -s ours
am:
a3ed438701
* commit '
a3ed4387016bb116659bba081fc1636b8c732e7b':
Assume input from /dev/stdin if no argument provided to btsnooz.py.
Change-Id: Ic33b785f042a9d3176f6d5a2873245372f651996
Victor Tasayco Loarte [Tue, 10 May 2016 15:37:31 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE implement wakelocks on bt adapter init am:
ef1f356866 -s ours
am:
86ccba4678 -s ours
* commit '
86ccba46786e7caa5a20fbc926f0328d4019e7a2':
DO NOT MERGE ANYWHERE implement wakelocks on bt adapter init
Change-Id: Ie45199e22bec6920bcd012f9d07c6d5d43a25197
Sharvil Nanavati [Tue, 10 May 2016 15:37:30 +0000 (15:37 +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
am:
9073d039b1 -s ours
* commit '
9073d039b1ac633231e0ab8a2c707bfc5beb3c6c':
DO NOT MERGE ANYWHERE Spoof response to AT+CNUM if we don't get a reply from the audio gateway.
Change-Id: Id80d31bce15408cd7e5d7ec85973e260ce4da4aa
Sharvil Nanavati [Tue, 10 May 2016 15:37:30 +0000 (15:37 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix return value for HAL function config_clear." into cw-e-dev am:
f1f9523db0 -s ours
am:
87912b8170 -s ours
* commit '
87912b817087d085f5f449b86f8657a06d0ded05':
DO NOT MERGE ANYWHERE Fix return value for HAL function config_clear.
Change-Id: I562fb07e9505f682936c57e879bbd3c823a144bc
Sharvil Nanavati [Tue, 10 May 2016 15:37:28 +0000 (15:37 +0000)]
Merge "DO NOT MERGE ANYWHERE Update GKI_freebuf to gracefully handle NULL." into cw-e-dev am:
e3aabcbbf5 -s ours
am:
9844f6c5dd -s ours
* commit '
9844f6c5dd8f29ad927e30506a0ff3f18623c210':
DO NOT MERGE ANYWHERE Update GKI_freebuf to gracefully handle NULL.
Change-Id: I1897d810347ea6899678ded06262344d403334b9
tturney [Tue, 10 May 2016 15:37:17 +0000 (15:37 +0000)]
Merge "Additional headsets blacklisted for absolute volume" into mnc-dr1.5-dev
am:
8c0745ad21 -s ours
* commit '
8c0745ad219588a5c4322cde8e0c1f99eda7959e':
Additional headsets blacklisted for absolute volume
Change-Id: I4ac0d3b86274d617eff2ff1eaa09ccde3b63cb2f
Sharvil Nanavati [Tue, 10 May 2016 15:16:44 +0000 (15:16 +0000)]
Remove unused definition BOARD_HAVE_BLUETOOTH_BCM. am:
ad46ee235f am:
cdecc6b300 -s ours
am:
adebb96cf0
* commit '
adebb96cf0d683ffd074887f3e9270c4fa32304b':
Remove unused definition BOARD_HAVE_BLUETOOTH_BCM.
Change-Id: I8acaac2256868e2eacab9a55f7e457a8022def3b
Sharvil Nanavati [Tue, 10 May 2016 15:10:02 +0000 (15:10 +0000)]
Remove unused definition BOARD_HAVE_BLUETOOTH_BCM. am:
ad46ee235f
am:
cdecc6b300 -s ours
* commit '
cdecc6b300c5498fd90938e5b74271ae8e1e7b63':
Remove unused definition BOARD_HAVE_BLUETOOTH_BCM.
Change-Id: I8f5d835553c27bd04bb0eebae78e193b8c4bcacb
Ajay Panicker [Mon, 9 May 2016 22:52:05 +0000 (22:52 +0000)]
Fix undefined usage of snprintf
am:
bd194901db
* commit '
bd194901dbbd2abebfe2510a1e97bb8d3a75102b':
Fix undefined usage of snprintf
Change-Id: Ic0508f3644379d8fb08fb13a43e38e3950a12c3a
Ajay Panicker [Thu, 5 May 2016 21:51:34 +0000 (14:51 -0700)]
Fix undefined usage of snprintf
Using a buffer as both the format and output for snprintf could
cause undefinied behaviour on certain platforms. Instead just
use a temporary variable.
Bug:
27882028
Change-Id: If9f96fba4b3447b3248917ab9fb994bd80cbca0f
Pavlin Radoslavov [Mon, 9 May 2016 18:00:19 +0000 (18:00 +0000)]
Update l2c_fcr_clone_buf() to allocate large enough buffer
am:
d5ebb89744
* commit '
d5ebb89744974ec1ac867838d1a005ebf97be9b2':
Update l2c_fcr_clone_buf() to allocate large enough buffer
Change-Id: I14a266372d8bf9be7eb5cf9e985a4f785bec466d
Pavlin Radoslavov [Mon, 9 May 2016 02:12:53 +0000 (19:12 -0700)]
Update l2c_fcr_clone_buf() to allocate large enough buffer
Apparently, in some parts of the code we assumed the original
buffer size is large enough and we can extend it and write
few more octets at the end.
Bug:
28351270
Change-Id: Idc53d8f68e55808c9f6bf7f18568288304a9bfb9
Pavlin Radoslavov [Fri, 6 May 2016 04:46:38 +0000 (04:46 +0000)]
Merge "Call BTA_VendorCleanup() during actual cleanup of the stack" into nyc-dev
am:
641d33861c
* commit '
641d33861c1845f11593b3e8494f18f2fa64c185':
Call BTA_VendorCleanup() during actual cleanup of the stack
Change-Id: I261889671d5e6162cccd8bbd225588e6361a6890
TreeHugger Robot [Fri, 6 May 2016 04:38:53 +0000 (04:38 +0000)]
Merge "Call BTA_VendorCleanup() during actual cleanup of the stack" into nyc-dev
Ajay Panicker [Fri, 6 May 2016 03:02:56 +0000 (03:02 +0000)]
Fix size of SDP black list array
am:
b790227413
* commit '
b79022741353c2c4438147b4cd75578e96ba06bb':
Fix size of SDP black list array
Change-Id: Ie35f3fabb44e8850b61ea123078357b482a6a7c3
Ajay Panicker [Thu, 5 May 2016 19:51:49 +0000 (12:51 -0700)]
Fix size of SDP black list array
Bug:
28617843
Change-Id: Iff5690e3aae42d9907ed9351f1059461985c8a20
Andy Hung [Fri, 6 May 2016 00:26:44 +0000 (00:26 +0000)]
Match socket buffer sizes between audio HAL and BT server
am:
e97d975cce
* commit '
e97d975cce213b8c6e4f69bc3fc75411a1743647':
Match socket buffer sizes between audio HAL and BT server
Change-Id: Ib257ca1ea7a5c73cd0f6e8c84703e5d7d58cccf3
Pavlin Radoslavov [Thu, 5 May 2016 23:20:15 +0000 (16:20 -0700)]
Call BTA_VendorCleanup() during actual cleanup of the stack
Previously, BTA_VendorCleanup() was called during the shutdown
process, and this created race condition crashing the stack.
Bug:
28450506
Change-Id: Ibee90d406036862b95d18e2ef00b08b820c70f68
Andy Hung [Wed, 4 May 2016 22:47:05 +0000 (15:47 -0700)]
Match socket buffer sizes between audio HAL and BT server
Adjust our mixer buffer size to be one quarter that of
the socket buffer size for quadruple buffering.
Increase socket buffer size from 20*512 to 28*512 to
smooth out variability in data draw from AudioFlinger.
Bug:
28286313
Change-Id: I8a9ca9e1f4639a0724cfe126acc670c2058cb0fb
Andre Eisenbach [Thu, 5 May 2016 22:04:34 +0000 (22:04 +0000)]
Return handle if an RFCOMM port is already open
am:
cafe4ea4a9
* commit '
cafe4ea4a969431e3783d7e9dcb701cf8052abd2':
Return handle if an RFCOMM port is already open
Change-Id: Ibb01fde5a5f33080f7e256eec121e2c5fae86275
Andre Eisenbach [Thu, 5 May 2016 17:57:44 +0000 (10:57 -0700)]
Return handle if an RFCOMM port is already open
By returning the handle, the upper layer (BTA) will attempt to
disconnect on failure to connect. Thus the attempt to open the port will
still fail, but any subsequent attempts will be able to recover.
Bug:
27204458
Change-Id: I0f8489b98adeb7f5e217201ffbbb35132a66f210
Pavlin Radoslavov [Thu, 5 May 2016 02:15:58 +0000 (02:15 +0000)]
Merge "Avoid NULL pointer usage of startup_future in case of HCI startup timeout" into nyc-dev
am:
1a3dc131a8
* commit '
1a3dc131a8fbac2db5bd7d7d8ace71d8087a5c12':
Avoid NULL pointer usage of startup_future in case of HCI startup timeout
Change-Id: If928af45f1c272762ed962d053b988d7bbd5c9db
TreeHugger Robot [Thu, 5 May 2016 02:09:02 +0000 (02:09 +0000)]
Merge "Avoid NULL pointer usage of startup_future in case of HCI startup timeout" into nyc-dev
Pavlin Radoslavov [Thu, 5 May 2016 01:09:12 +0000 (01:09 +0000)]
Fixed test_periodic_unregister_processing_queue unit test
am:
bafbe828a5
* commit '
bafbe828a56b7a8654b09c5612c8a0021ea5a864':
Fixed test_periodic_unregister_processing_queue unit test
Change-Id: I30f282b289d47cc26fa04f795c0930bf87f99872
Pavlin Radoslavov [Wed, 4 May 2016 06:00:15 +0000 (23:00 -0700)]
Fixed test_periodic_unregister_processing_queue unit test
Removed a copy-and-paste check in the
test_periodic_unregister_processing_queue unit test.
The removed check adds little value - it has time-dependency,
and is not robust.
Bug:
26982349
Change-Id: I4adb948713b9946b5eb821d6fe52b7ada1400182
Pavlin Radoslavov [Wed, 4 May 2016 03:20:06 +0000 (20:20 -0700)]
Avoid NULL pointer usage of startup_future in case of HCI startup timeout
Previously, the startup_timer was created within the HCI layer start_up()
function, and after several vendor calls, we created the startup_future
that is used elsewhere. However, if any of the vendor calls blocks for
very long time, the startup_timer will timeout.
The startup_timer_expired() callback will try to use startup_future
that is still NULL, and that will trigger an assert.
The issue is avoided by creating the startup_future right before
the startup_timer is scheduled.
Bug:
28528815
Change-Id: Ib9f2c6581a86d3df0fd4d02d0b4c290663b5cfa1
Pavlin Radoslavov [Wed, 4 May 2016 02:08:56 +0000 (02:08 +0000)]
Update alarm_unregister_processing_queue() to cancel scheduled alarms
am:
1db7f1b0a7
* commit '
1db7f1b0a7d235977ac81623ab06c51df8b493de':
Update alarm_unregister_processing_queue() to cancel scheduled alarms
Change-Id: Ib33f701739470562377af85c4ae5750e4d730aa1
Pavlin Radoslavov [Mon, 2 May 2016 17:52:07 +0000 (10:52 -0700)]
Update alarm_unregister_processing_queue() to cancel scheduled alarms
Update the alarm_unregister_processing_queue() implementation
so it cancels all alarms that are scheduled on the corresponding
queue.
This fixes a race condition during Bluetooth shutdown: if an alarm
expires right after an alarm processing queue is invalidated,
the alarm processing would try to use the invalidated queue.
Added the corresponding unit tests.
Also, added a missing call to alarm_unregister_processing_queue().
Bug:
26982349
Change-Id: I09a111e8080b6dbc354dffa03a487f7a8c578ce6
Pavlin Radoslavov [Tue, 3 May 2016 00:48:54 +0000 (00:48 +0000)]
Merge "Add read/write timeout to the audio sockets" into nyc-dev
am:
8456e86576
* commit '
8456e865765b86878f966ceee4a69038c465009e':
Add read/write timeout to the audio sockets
Change-Id: I63e5de1002063e5601c8bc89f465e4b892026729
TreeHugger Robot [Tue, 3 May 2016 00:44:56 +0000 (00:44 +0000)]
Merge "Add read/write timeout to the audio sockets" into nyc-dev
Pavlin Radoslavov [Tue, 3 May 2016 00:38:11 +0000 (00:38 +0000)]
Fix test_set_zero_periodic unit test failure
am:
655f11b43b
* commit '
655f11b43b62fb23a32157dc2360f38bf109556d':
Fix test_set_zero_periodic unit test failure
Change-Id: I0f068129130e9a69bf0c08f5701978723aeae161
Pavlin Radoslavov [Mon, 2 May 2016 22:53:22 +0000 (15:53 -0700)]
Fix test_set_zero_periodic unit test failure
Removed an "EXPECT_EQ(cb_counter, 0)" statement
right after a timer of value 0 is scheduled.
The EXPECT_EQ statement shouldn't be there,
because by the time it is reached, the callback might
have been called already.
Change-Id: I61fbec96c436787321c6b36006a2bc1c0e627667
Pavlin Radoslavov [Mon, 2 May 2016 20:40:26 +0000 (13:40 -0700)]
Add read/write timeout to the audio sockets
Add read/write timeout of 2 seconds when reading/writing
from/to the audio-related control and data sockets.
Also, removed unnecessary poll(POLLOUT), because it is not needed anymore.
Bug:
27996931
Change-Id: Ib214a85f4837760b17cded155464957f56806bd3
Sharvil Nanavati [Sat, 30 Apr 2016 04:17:56 +0000 (04:17 +0000)]
Merge "DO NOT MERGE ANYWHERE" into cw-e-dev am:
560033035b -s ours am:
9c68fd9a4d -s ours
am:
e460c29607 -s ours
* commit '
e460c29607ce0681976146159c3aae8fde45ec1b':
DO NOT MERGE ANYWHERE
Change-Id: Ia3ace95e8f5aef047783f2d0b09b66479860e2ca
Chenjie Luo [Sat, 30 Apr 2016 04:17:55 +0000 (04:17 +0000)]
Merge "DO NOT MERGE ANYWHERE Disconnect the AVDT connection for A2DP SRC device." into cw-e-dev am:
5084f0166e -s ours am:
2c8ae3d115 -s ours
am:
9f32b9e3cb -s ours
* commit '
9f32b9e3cb9a89b59f5185fa6968432beb83621c':
DO NOT MERGE ANYWHERE Disconnect the AVDT connection for A2DP SRC device.
Change-Id: I04fce367fcd467246b4399b84044c691430d37a2
Sharvil Nanavati [Sat, 30 Apr 2016 04:17:55 +0000 (04:17 +0000)]
DO NOT MERGE ANYWHERE am:
95f816945a -s ours am:
0e2a631634 -s ours
am:
813a0cb118 -s ours
* commit '
813a0cb118a44260943b418b197f5923c02c822c':
DO NOT MERGE ANYWHERE
Change-Id: I81723b3b6bc71d695c0d9312ab437ad9d755b771
Devin Kim [Sat, 30 Apr 2016 04:17:54 +0000 (04:17 +0000)]
Do not send AT+CHLD=? if the 3-way call feature is not supported am:
79dc36d01a am:
b616d01f01
am:
011012f605
* commit '
011012f6051cf27424d55e83ca959aaa4be641bf':
Do not send AT+CHLD=? if the 3-way call feature is not supported
Change-Id: I69ece01e2df5a1b47ef40e2540953668051f5515
Sathya Kumar [Sat, 30 Apr 2016 04:17:53 +0000 (04:17 +0000)]
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links am:
a8bb3ae08b -s ours am:
66f79db6e6 -s ours
am:
b6d3f76f84 -s ours
* commit '
b6d3f76f844110cf6b22d72b5704d93f3d40d553':
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links
Change-Id: I639c1335d58a86b4b26a08eaca871ee51882701a
Sharvil Nanavati [Sat, 30 Apr 2016 04:15:29 +0000 (04:15 +0000)]
Merge "DO NOT MERGE ANYWHERE" into cw-e-dev am:
560033035b -s ours
am:
9c68fd9a4d -s ours
* commit '
9c68fd9a4d4e832664aeb91380bc5d1c444b4a2b':
DO NOT MERGE ANYWHERE
Change-Id: Idee1fabfffc5a3cc04e8aaf7d586bbd4c41e9e3a
Chenjie Luo [Sat, 30 Apr 2016 04:15:27 +0000 (04:15 +0000)]
Merge "DO NOT MERGE ANYWHERE Disconnect the AVDT connection for A2DP SRC device." into cw-e-dev am:
5084f0166e -s ours
am:
2c8ae3d115 -s ours
* commit '
2c8ae3d1153e1a69383171a8c5be50a894952132':
DO NOT MERGE ANYWHERE Disconnect the AVDT connection for A2DP SRC device.
Change-Id: I5efb950b73e2f30966013ccebc6366c9d3c2a10a
Sharvil Nanavati [Sat, 30 Apr 2016 04:15:25 +0000 (04:15 +0000)]
DO NOT MERGE ANYWHERE am:
95f816945a -s ours
am:
0e2a631634 -s ours
* commit '
0e2a631634ff759cba204b027284fa2ba3a07ba6':
DO NOT MERGE ANYWHERE
Change-Id: I90953865e007542f493d6da6c47599e71467b664
Devin Kim [Sat, 30 Apr 2016 04:15:24 +0000 (04:15 +0000)]
Do not send AT+CHLD=? if the 3-way call feature is not supported am:
79dc36d01a
am:
b616d01f01
* commit '
b616d01f01b8ebaa30629916556a86b423be758f':
Do not send AT+CHLD=? if the 3-way call feature is not supported
Change-Id: I478b834744c25f03d1202b1834279adb2c29d22a
Sathya Kumar [Sat, 30 Apr 2016 04:15:22 +0000 (04:15 +0000)]
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links am:
a8bb3ae08b -s ours
am:
66f79db6e6 -s ours
* commit '
66f79db6e607e3c51656a5532618b94c847118de':
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links
Change-Id: I1f3de149a2fc44b8ad6cc39341cd69349eeb3c82
Sharvil Nanavati [Sat, 30 Apr 2016 04:15:19 +0000 (04:15 +0000)]
resolve merge conflicts of
00a44d2 to nyc-dev
am:
5aa2f31c77
* commit '
5aa2f31c774c8a8c8b7b4d2e587ce921d4857403':
Per Motorola, we're going to revert this change and submit Moto-specific code for this.
Change-Id: I297de2cbbefc9a67fe72321499921dd0c523760d
Sharvil Nanavati [Sat, 30 Apr 2016 00:06:08 +0000 (17:06 -0700)]
resolve merge conflicts of
00a44d2 to nyc-dev
Change-Id: I64ef6cb1eb5996674e9919d13fadd43ede1d4b8c
Pankaj Kanwar [Fri, 29 Apr 2016 23:44:49 +0000 (23:44 +0000)]
resolve merge conflicts of
f7388e6 to nyc-dev
am:
4ec6f7603a
* commit '
4ec6f7603acaf453a1f280e2fad1a1d0e35dbfa5':
Offload config save functionality to BTIF thread
Change-Id: Ie34873f424479ddb93af79eef6f3072f38322f2e
Pavlin Radoslavov [Fri, 29 Apr 2016 22:12:33 +0000 (15:12 -0700)]
resolve merge conflicts of
f7388e6 to nyc-dev
Change-Id: I149778411a50fc5881b84cec01a2a4b43cbd2b5c
Sharvil Nanavati [Fri, 29 Apr 2016 20:46:35 +0000 (20:46 +0000)]
Fix build break caused by missing braces around struct initializer.
am:
b75ec300d2
* commit '
b75ec300d2e7e0725eddb0e43d99ac85fc7197c4':
Fix build break caused by missing braces around struct initializer.
Change-Id: I66d8378fbec221e8b552fed464252afcd4e7fced
Sharvil Nanavati [Fri, 29 Apr 2016 19:35:45 +0000 (12:35 -0700)]
Fix build break caused by missing braces around struct initializer.
Change-Id: Iba376e9e4fdcfc032bdd2d20a6de7ba18c8de98c
Andre Eisenbach [Fri, 29 Apr 2016 18:36:28 +0000 (18:36 +0000)]
Merge "Additional headsets blacklisted for absolute volume" into mnc-dr1.5-dev am:
006ede7ac2
am:
384d86594e
* commit '
384d86594e830c14c92d2fe29b32f56777b14a21':
Additional headsets blacklisted for absolute volume
Change-Id: I8391c3e5cd987c7c03293a963ba8208769b4aec5
Marie Janssen [Fri, 29 Apr 2016 18:36:27 +0000 (18:36 +0000)]
Fix crashes with lots of discovered LE devices am:
05419c8b96 am:
7a5fa57019 am:
0ff343e006 am:
6b0e6b5779
am:
1da6f76e96
* commit '
1da6f76e96afdbb76f4557987c696a0adb6df4f0':
Fix crashes with lots of discovered LE devices
Change-Id: If9a25f1de82e48b5fa941b0e284fb40d29af9a66
Andre Eisenbach [Fri, 29 Apr 2016 18:34:14 +0000 (18:34 +0000)]
Merge "Additional headsets blacklisted for absolute volume" into mnc-dr1.5-dev
am:
006ede7ac2
* commit '
006ede7ac2c509ca6cba4d34b3f048bb3b6f429f':
Additional headsets blacklisted for absolute volume
Change-Id: I268c859ba121f524147ba0a7878f1705d47b8976
Marie Janssen [Fri, 29 Apr 2016 18:34:12 +0000 (18:34 +0000)]
Fix crashes with lots of discovered LE devices am:
05419c8b96 am:
7a5fa57019 am:
0ff343e006
am:
6b0e6b5779
* commit '
6b0e6b57797bdf4af5656438404c91f7fe4f6ef1':
Fix crashes with lots of discovered LE devices
Change-Id: I4d45aa391459c932396c8f7bb06f24079da8f48c
Sharvil Nanavati [Fri, 29 Apr 2016 18:34:08 +0000 (18:34 +0000)]
resolve merge conflicts of
405ec18 to nyc-dev
am:
2ef994a0ab
* commit '
2ef994a0abccc556de97c22d517001801f344046':
Disable 3Mbps packets for AVDT ACL links
Change-Id: I4c69aabdc1f3e9dd14f6c44d07ac0809fe0b0915
Sharvil Nanavati [Thu, 28 Apr 2016 21:54:35 +0000 (14:54 -0700)]
resolve merge conflicts of
405ec18 to nyc-dev
Change-Id: I94b431287ae831d64dc734f8cd3f071e49a9d6eb
Pavlin Radoslavov [Tue, 26 Apr 2016 23:47:11 +0000 (23:47 +0000)]
Fix issues during cleanup stage of the Bluetooth stack
am:
3a44a7a
* commit '
3a44a7a4f6b2dec169097152739d7fdd38482b72':
Fix issues during cleanup stage of the Bluetooth stack
Change-Id: I6a97ed31f2779828ffe871f357d67881337bd069
Pavlin Radoslavov [Tue, 26 Apr 2016 19:18:36 +0000 (12:18 -0700)]
Fix issues during cleanup stage of the Bluetooth stack
* Moved free-ing of bta_av_cb timers from the init function
to the cleanup stage.
* Changed the usage of btif_jni_disassociate() so it is called
synchronously. Its previous usage was complicated -
the function was called asynchronously on a different thread,
and we had to wait on a future for its completion.
* Renamed function btif_shutdown_bluetooth() to
btif_cleanup_bluetooth() to represent better its purpose.
Similarly, bte_main_shutdown() is renamed to bte_main_cleanup()
Also:
* Removed function btif_init_fail(), because it is not used.
* Updated an error log message inside function
btif_in_execute_service_request() so the log information
is accurate and more useful.
* Updated the log messages related to the lifecycle of a module
in btcore/src/module.c
Bug:
26982349
Change-Id: Icd6f159d993bdb9c8ef09bfb5b1386b3d6ea4ff2
Andre Eisenbach [Tue, 26 Apr 2016 19:23:16 +0000 (19:23 +0000)]
Do not log unsolicited NOOP command complete events
am:
eb38505
* commit '
eb38505134c910b944ecb6de615d3705fb2b09d7':
Do not log unsolicited NOOP command complete events
Change-Id: I20f0945235a0d85e4d56f58c77a2c01dc47f6f3f
Andre Eisenbach [Tue, 26 Apr 2016 16:51:06 +0000 (09:51 -0700)]
Do not log unsolicited NOOP command complete events
Bug:
27744135
Change-Id: I683e3a9f0a116f83763ebcf4d0583ea1c89ef5b2
Andre Eisenbach [Tue, 26 Apr 2016 16:40:39 +0000 (16:40 +0000)]
Revert "Turn down excess logging in bt hci"
am:
0b39c0a
* commit '
0b39c0a0ee6c372f022268dcf76ca50e1cf2e4b3':
Revert "Turn down excess logging in bt hci"
Change-Id: Ief3b57f750aaab5395d514ba95da507b51bce7c6
Andre Eisenbach [Wed, 30 Mar 2016 03:26:13 +0000 (03:26 +0000)]
Revert "Turn down excess logging in bt hci"
This log message is likely very necessary and if you see this excessively, we will want to know about it...
This reverts commit
11cfdf303c420d14e6cf3e4d2ca856b827ba44cf.
Change-Id: Iefd46b7aab3373a1547d83c05166fa21034c51a0
Pavlin Radoslavov [Mon, 25 Apr 2016 21:50:27 +0000 (21:50 +0000)]
Fix a race condition during alarm_cleanup()
am:
97ec0a5
* commit '
97ec0a56f5282ee8977bc1dcb60bb86980e757d6':
Fix a race condition during alarm_cleanup()
Change-Id: I5c8a45f82d6184a5f2ce16e7467a3bb7ec51af3c
Pavlin Radoslavov [Mon, 25 Apr 2016 19:29:29 +0000 (12:29 -0700)]
Fix a race condition during alarm_cleanup()
Fix a race condition inside function alarm_cleanup() that
could be triggered during shutdown.
Also, fix few other issues:
* Add missing "timer_delete(akeup_timer)" statement inside
alarm_cleanup()
* Fix the argument when calling "timer_delete(timer)"
* Call "semaphore_free(alarm_expired)" inside alarm_cleanup()
after the corresponding "timer" and "wakeup_timer" have
been deleted.
* Fix the argument type when calling eventfd_read() inside
semaphore_wait()
Bug:
26982349
Change-Id: I2b00cd7ee7f56f755775f8e7b370006e31c6eb08
Bluetooth Build Test [Mon, 25 Apr 2016 21:28:43 +0000 (21:28 +0000)]
Fix sluggish HID devices
am:
3165425
* commit '
3165425aff5744bf682a2887e9704e66f8d34a87':
Fix sluggish HID devices
Change-Id: Ifa1a7911ac0baa332e8fc3ef5a6932c6c120c85b
Bluetooth Build Test [Wed, 13 Apr 2016 14:39:53 +0000 (16:39 +0200)]
Fix sluggish HID devices
Right now, when connecting to HID devices, preferred connection
parameters are not being used. This is because of bug in GAP profile.
This make all HID devices use default connection parameters, which
mean that they behave sluggish. This patch fixes that by forcing
HID devices to re-read connection parameters on each reconnection.
This is a temporary workaround until GAP is rewritten.
Bug:
28378306
Change-Id: I74b70ad8e96c29517cace808632fe4d8e0251994
Manu Viswanadhan [Sat, 23 Apr 2016 02:53:14 +0000 (02:53 +0000)]
Fix FD leak caused by module wrapper thread
am:
69b9e7c
* commit '
69b9e7c735c94ed9c4f3cad47be8f679bcad2e6b':
Fix FD leak caused by module wrapper thread
Change-Id: Ibd8069620f6b009c060288284c82ce15d7b48412
Manu Viswanadhan [Tue, 19 Apr 2016 09:28:40 +0000 (14:58 +0530)]
Fix FD leak caused by module wrapper thread
Use Case: Repeated BT ON/OFF
Failure: FD leak is observed with ON/OFF stress test
which eventually leads to crash due to unavailability
of FDs.
Steps:
BT ON/OFF.
Root Cause: During cleanup the module wrapper thread is
stopped but the resources are not freed, leading to FD leak.
Fix: Cleanup the module wrapper thread properly so that there
are no resource leaks.
Bug:
28312228
Change-Id: I4de2fba9c98a0e4ae73315759ec6bc8bf273948e
Pavlin Radoslavov [Sat, 23 Apr 2016 00:39:31 +0000 (00:39 +0000)]
Merge "Fix a Floating point exception for periodic timers" into nyc-dev
am:
ff86842
* commit '
ff868423456f3b3ab40646df8dccfff0c099aea7':
Fix a Floating point exception for periodic timers
Change-Id: Icd3b5350c089b3a077f6d176fbf29062b85553dd
Pavlin Radoslavov [Sat, 23 Apr 2016 00:34:12 +0000 (00:34 +0000)]
Merge "Improve debug-ability of the stack manager" into nyc-dev
am:
88c7f54
* commit '
88c7f54db69ded44b3017e6a1ccbc05352103683':
Improve debug-ability of the stack manager
Change-Id: I84826e37b9e7cac2a2c52cba882ebcb606dc0a36
Pavlin Radoslavov [Sat, 23 Apr 2016 00:34:11 +0000 (00:34 +0000)]
Add missing mutex lock/unlock inside alarm_cleanup()
am:
f338fb7
* commit '
f338fb754e00d51c31c96f755b05d8daf6006168':
Add missing mutex lock/unlock inside alarm_cleanup()
Change-Id: I2f05bdabb92117e8bd651ff039adf4e18c968c0e