OSDN Git Service
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Mike Lockwood [Wed, 13 May 2009 13:51:32 +0000 (09:51 -0400)]
liba2dp: Move control logic to a separate thread to avoid blocking audio writes.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:51 +0000 (17:56 -0700)]
merge cupcake into donut
Nick Pelly [Mon, 13 Apr 2009 23:11:00 +0000 (16:11 -0700)]
AI 145972: am: CL 145785 Don't close the A2DP data socket on data error - prevents mediaserver from wedging on A2DP device poweroff.
This prevents a race that occurs when an A2DP headset is powered down. If the data socket closes itself then mediaserver tries to recover the stream, while the control path in hcid tries to cleanup the disconnected stream. hcid cant handle this and wedges mediaserver.
Instead let the control path code trigger all the cleanup (including eventually closing the data socket through bluetooth_close() or bluetooth_stop()).
Original author: npelly
Merged from: //branches/cupcake/...
Automated import of CL 145972
Nick Pelly [Fri, 10 Apr 2009 23:41:57 +0000 (16:41 -0700)]
AI 145785: Don't close the A2DP data socket on data error - prevents mediaserver from wedging on A2DP device poweroff.
This prevents a race that occurs when an A2DP headset is powered down. If the data socket closes itself then mediaserver tries to recover the stream, while the control path in hcid tries to cleanup the disconnected stream. hcid cant handle this and wedges mediaserver.
Instead let the control path code trigger all the cleanup (including eventually closing the data socket through bluetooth_close() or bluetooth_stop()).
BUG=
1774568
Automated import of CL 145785
Nick Pelly [Tue, 31 Mar 2009 22:24:36 +0000 (15:24 -0700)]
AI 143826: am: CL 143774 Fix SIGSEGV attempting to make callback on freed session.
pid: 3290, tid: 3290 >>> /system/bin/hcid <<<
signal 11 (SIGSEGV), fault addr
0000001a
r0
00014c70 r1
00000000 r2
bea74a80 r3
00000014
r4
00000450 r5
00014c70 r6
0000001b r7
0000008a
r8
000003e8 r9
00010a90 10
000135b0 fp
00000000
ip
aed141c0 sp
bea74a80 lr
aed05611 pc
0000001a
Stack Trace:
RELADDR FUNCTION FILE:LINE
0000560e finalize_discovery external/bluez/utils/audio/avdtp.c:851
00006ee2 connection_lost external/bluez/utils/audio/avdtp.c:889
00007226 disconnect_timeout external/bluez/utils/audio/avdtp.c:594
00021804 timeout_handlers_check external/bluez/utils/eglib/gmain.c:456
000219d2 g_main_loop_run external/bluez/utils/eglib/gmain.c:557
v------> main external/bluez/utils/hcid/main.c:979
00019dc2 .text external/bluez/utils/hcid/main.c:979
0001fd22 __libc_init_common bionic/libc/bionic/libc_init_common.c:121
0000bcb2 __libc_init bionic/libc/bionic/libc_init_dynamic.c:65
v------> link_image bionic/linker/linker.c:1637
b000157e __dl_$t bionic/linker/linker.c:1637
Original author: npelly
Merged from: //branches/cupcake/...
Automated import of CL 143826
Nick Pelly [Tue, 31 Mar 2009 21:28:51 +0000 (14:28 -0700)]
AI 143774: Fix SIGSEGV attempting to make callback on freed session.
pid: 3290, tid: 3290 >>> /system/bin/hcid <<<
signal 11 (SIGSEGV), fault addr
0000001a
r0
00014c70 r1
00000000 r2
bea74a80 r3
00000014
r4
00000450 r5
00014c70 r6
0000001b r7
0000008a
r8
000003e8 r9
00010a90 10
000135b0 fp
00000000
ip
aed141c0 sp
bea74a80 lr
aed05611 pc
0000001a
Stack Trace:
RELADDR FUNCTION FILE:LINE
0000560e finalize_discovery external/bluez/utils/audio/avdtp.c:851
00006ee2 connection_lost external/bluez/utils/audio/avdtp.c:889
00007226 disconnect_timeout external/bluez/utils/audio/avdtp.c:594
00021804 timeout_handlers_check external/bluez/utils/eglib/gmain.c:456
000219d2 g_main_loop_run external/bluez/utils/eglib/gmain.c:557
v------> main external/bluez/utils/hcid/main.c:979
00019dc2 .text external/bluez/utils/hcid/main.c:979
0001fd22 __libc_init_common bionic/libc/bionic/libc_init_common.c:121
0000bcb2 __libc_init bionic/libc/bionic/libc_init_dynamic.c:65
v------> link_image bionic/linker/linker.c:1637
b000157e __dl_$t bionic/linker/linker.c:1637
BUG=
1749718
Automated import of CL 143774
Mike Lockwood [Tue, 31 Mar 2009 18:05:44 +0000 (11:05 -0700)]
AI 143676: am: CL 143537 Sanity check to make sure the session still exists in auth_cb().
BUG=
1744549
Original author: lockwood
Merged from: //branches/cupcake/...
Automated import of CL 143676
Mike Lockwood [Mon, 30 Mar 2009 22:24:03 +0000 (15:24 -0700)]
AI 143537: Sanity check to make sure the session still exists in auth_cb().
BUG=
1744549
Automated import of CL 143537
Nick Pelly [Thu, 26 Mar 2009 00:33:54 +0000 (17:33 -0700)]
Automated import from //branches/donutburger/...@142766,142766
Nick Pelly [Wed, 25 Mar 2009 22:43:37 +0000 (15:43 -0700)]
Automated import from //branches/cupcake/...@142761,142761
Nick Pelly [Wed, 25 Mar 2009 03:45:28 +0000 (20:45 -0700)]
Automated import from //branches/donutburger/...@141697,141697
Nick Pelly [Wed, 25 Mar 2009 02:52:15 +0000 (19:52 -0700)]
Automated import from //branches/donutburger/...@141219,141219
Nick Pelly [Wed, 25 Mar 2009 01:11:41 +0000 (18:11 -0700)]
Automated import from //branches/cupcake/...@141694,141694
The Android Open Source Project [Fri, 20 Mar 2009 06:08:37 +0000 (23:08 -0700)]
auto import from //branches/cupcake_rel/...@141571
The Android Open Source Project [Thu, 19 Mar 2009 00:39:43 +0000 (17:39 -0700)]
auto import from //branches/cupcake_rel/...@140373
The Android Open Source Project [Fri, 13 Mar 2009 20:04:20 +0000 (13:04 -0700)]
auto import from //branches/cupcake_rel/...@138607
The Android Open Source Project [Wed, 11 Mar 2009 19:11:54 +0000 (12:11 -0700)]
auto import from //branches/cupcake/...@137873
The Android Open Source Project [Fri, 6 Mar 2009 04:00:41 +0000 (20:00 -0800)]
auto import from //depot/cupcake/@136745
The Android Open Source Project [Thu, 5 Mar 2009 22:34:30 +0000 (14:34 -0800)]
auto import from //depot/cupcake/@136594
The Android Open Source Project [Wed, 4 Mar 2009 03:29:18 +0000 (19:29 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 02:28:18 +0000 (18:28 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Tue, 3 Mar 2009 22:04:01 +0000 (14:04 -0800)]
auto import from //depot/cupcake/@132589
The Android Open Source Project [Tue, 3 Mar 2009 06:54:23 +0000 (22:54 -0800)]
auto import from //depot/cupcake/@137055
The Android Open Source Project [Fri, 20 Feb 2009 15:38:28 +0000 (07:38 -0800)]
auto import from //branches/cupcake/...@132569
The Android Open Source Project [Thu, 19 Feb 2009 18:57:29 +0000 (10:57 -0800)]
auto import from //branches/cupcake/...@132276
The Android Open Source Project [Fri, 13 Feb 2009 20:57:48 +0000 (12:57 -0800)]
auto import from //branches/cupcake/...@131421
The Android Open Source Project [Tue, 10 Feb 2009 23:43:58 +0000 (15:43 -0800)]
auto import from //branches/cupcake/...@130745
The Android Open Source Project [Thu, 22 Jan 2009 08:13:40 +0000 (00:13 -0800)]
auto import from //branches/cupcake/...@127436
The Android Open Source Project [Tue, 20 Jan 2009 22:03:55 +0000 (14:03 -0800)]
auto import from //branches/cupcake/...@127101
The Android Open Source Project [Fri, 16 Jan 2009 00:12:07 +0000 (16:12 -0800)]
auto import from //branches/cupcake/...@126645
The Android Open Source Project [Sat, 10 Jan 2009 01:51:19 +0000 (17:51 -0800)]
auto import from //branches/cupcake/...@125939
The Android Open Source Project [Thu, 18 Dec 2008 02:04:08 +0000 (18:04 -0800)]
Code drop from //branches/cupcake/...@124589
The Android Open Source Project [Tue, 21 Oct 2008 14:00:00 +0000 (07:00 -0700)]
Initial Contribution
Upstream [Mon, 12 Jan 1970 13:46:40 +0000 (13:46 +0000)]
external/bluez libs-3.35
Upstream [Mon, 12 Jan 1970 13:46:40 +0000 (13:46 +0000)]
external/bluez hcidump-1.41
Upstream [Mon, 12 Jan 1970 13:46:40 +0000 (13:46 +0000)]
external/bluez utils-3.35