OSDN Git Service
Mark Salyzyn [Thu, 12 Jan 2017 23:52:08 +0000 (23:52 +0000)]
Merge "liblog: use log/log.h for ALOG macros" am:
59cfe7de39 am:
c6d07e8230
am:
15b18326b6
Change-Id: I5f4906534e4b892566776b8ee0f005fb6543c283
Mark Salyzyn [Thu, 12 Jan 2017 23:49:37 +0000 (23:49 +0000)]
Merge "liblog: use log/log.h for ALOG macros" am:
59cfe7de39
am:
c6d07e8230
Change-Id: Ia3c81c04b689ae06610df61d27627dd66d5f71bd
Mark Salyzyn [Thu, 12 Jan 2017 23:47:37 +0000 (23:47 +0000)]
Merge "liblog: use log/log.h for ALOG macros"
am:
59cfe7de39
Change-Id: Ic961061fc8b320bc6e8525005ade7423d09ad79b
Mark Salyzyn [Thu, 12 Jan 2017 23:44:49 +0000 (23:44 +0000)]
Merge "liblog: use log/log.h for ALOG macros"
qinzhichao [Thu, 12 Jan 2017 23:40:05 +0000 (23:40 +0000)]
Merge "Fix issues crashing with Fatal signal when calling getFormat" am:
1808b0e3e4 am:
93b375b781
am:
4fdfda5cd2
Change-Id: I080c8c2e71488c9799e2730be97ef68db2f7d866
qinzhichao [Thu, 12 Jan 2017 23:37:33 +0000 (23:37 +0000)]
Merge "Fix issues crashing with Fatal signal when calling getFormat" am:
1808b0e3e4
am:
93b375b781
Change-Id: I69aac49027bb64539da78406637d3bbce26d0e77
qinzhichao [Thu, 12 Jan 2017 23:35:11 +0000 (23:35 +0000)]
Merge "Fix issues crashing with Fatal signal when calling getFormat"
am:
1808b0e3e4
Change-Id: Ie79ccfbf101b3a7144f7a7a80d1af7bdeb53cae5
Treehugger Robot [Thu, 12 Jan 2017 23:31:55 +0000 (23:31 +0000)]
Merge "Fix issues crashing with Fatal signal when calling getFormat"
Mark Salyzyn [Thu, 12 Jan 2017 23:10:27 +0000 (15:10 -0800)]
liblog: use log/log.h for ALOG macros
Test: compile
Bug:
34250038
Change-Id: Ie3b92790df631dbacdd51053264dddeba66913c1
Pavlin Radoslavov [Wed, 11 Jan 2017 19:25:56 +0000 (19:25 +0000)]
Merge "Add missing nullptr checks for data.readCString() strings" am:
ce961d374f am:
238c48e42e
am:
877f779979
Change-Id: Ic6e96b9ff3ecc609c40f8c5d5367a789b3732b7e
Pavlin Radoslavov [Wed, 11 Jan 2017 19:20:24 +0000 (19:20 +0000)]
Merge "Add missing nullptr checks for data.readCString() strings" am:
ce961d374f
am:
238c48e42e
Change-Id: I2e9cb8ec6752506cc5445aee3d38ae92e4f5e514
Pavlin Radoslavov [Wed, 11 Jan 2017 19:14:53 +0000 (19:14 +0000)]
Merge "Add missing nullptr checks for data.readCString() strings"
am:
ce961d374f
Change-Id: Id45f58c1c231d5212fc8d1807dbd7255dadfc65f
Treehugger Robot [Wed, 11 Jan 2017 19:04:30 +0000 (19:04 +0000)]
Merge "Add missing nullptr checks for data.readCString() strings"
qinzhichao [Sat, 31 Dec 2016 07:36:18 +0000 (15:36 +0800)]
Fix issues crashing with Fatal signal when calling getFormat
when playing multimedia file, GenericSource::getTrackInfo run in the
NuPlayerDriver thread, and GenericSource::getFormatMeta run in the
Generic thread. they would access the critical resource which is
mMetaData in IMediaSource. There is no lock to protect mMetaData.
Occasionally, SIGSEGV occurs when mMetaData point to a new object.
Instead getting trackInfo in Generic thread.
Bug:
34220591
Signed-off-by: qinzhichao <qinzhichao@xiaomi.com>
Pavlin Radoslavov [Tue, 10 Jan 2017 07:27:29 +0000 (23:27 -0800)]
Add missing nullptr checks for data.readCString() strings
Protect the Audio Policy Manager by adding extra checks
for data.readCString() strings when parsing / decoding
a Binder transaction.
Also:
* Moved audio_is_output_device() / audio_is_input_device() checks
inside handleDeviceConfigChange()
from the AudioPolicyInterface to the AudioPolicyManager
* Removed similar redundant checks inside
AudioPolicyService::setDeviceConnectionState()
Test: code compilation
Change-Id: Ib32a28ba2669b73aaf32b31bb18f41c8dd7d2605
Jerry Zhang [Wed, 11 Jan 2017 01:05:20 +0000 (01:05 +0000)]
Merge "Use FUNCTIONFS_ENDPOINT_ALLOC_BUFFER ioctl to improve performance." am:
20adbc0003 am:
ba6324e7fe
am:
7ceeb44566
Change-Id: I46a95f788daf5c91219adb1e651324801df47680
Jerry Zhang [Wed, 11 Jan 2017 01:00:19 +0000 (01:00 +0000)]
Merge "Use FUNCTIONFS_ENDPOINT_ALLOC_BUFFER ioctl to improve performance." am:
20adbc0003
am:
ba6324e7fe
Change-Id: I606659ad2b03094b23508ca4b52c120158569a1f
Jerry Zhang [Wed, 11 Jan 2017 00:55:48 +0000 (00:55 +0000)]
Merge "Use FUNCTIONFS_ENDPOINT_ALLOC_BUFFER ioctl to improve performance."
am:
20adbc0003
Change-Id: I7766be5e483a6ca71abf879ee9a7b867657c371a
Jerry Zhang [Wed, 11 Jan 2017 00:50:02 +0000 (00:50 +0000)]
Merge "Use FUNCTIONFS_ENDPOINT_ALLOC_BUFFER ioctl to improve performance."
Jerry Zhang [Fri, 16 Dec 2016 01:07:38 +0000 (17:07 -0800)]
Use FUNCTIONFS_ENDPOINT_ALLOC_BUFFER ioctl to improve performance.
The ioctl preallocates kernel buffers for the read/write syscalls,
reducing memory fragmentation and allowing for larger buffers,
as well as removing the kmalloc overhead.
Test: Manual
Change-Id: I9f5fef1b1625c1a2cda374541d8042f7e0ba78f5
Jack He [Tue, 10 Jan 2017 21:58:07 +0000 (21:58 +0000)]
Merge "Convert Android.mk in libaudioclient to Android.bp" am:
0da9804f12 am:
05dfbecf27
am:
19031e678e
Change-Id: I528e03e58d8a34316cf8270d3bb2b5b5d828eee1
Jack He [Tue, 10 Jan 2017 21:53:37 +0000 (21:53 +0000)]
Merge "Convert Android.mk in libaudioclient to Android.bp" am:
0da9804f12
am:
05dfbecf27
Change-Id: I855fe9d7f9d6302eda5e5f3d747a10b2d3b3b193
Jack He [Tue, 10 Jan 2017 21:48:35 +0000 (21:48 +0000)]
Merge "Convert Android.mk in libaudioclient to Android.bp"
am:
0da9804f12
Change-Id: Ie7fed077481c70205b16a1050646266a80c49ba0
Treehugger Robot [Tue, 10 Jan 2017 21:39:37 +0000 (21:39 +0000)]
Merge "Convert Android.mk in libaudioclient to Android.bp"
Mark Salyzyn [Tue, 10 Jan 2017 21:24:16 +0000 (21:24 +0000)]
Merge "liblog: use log/log.h for ALOG macros" am:
06d8feefec am:
71bf335ffa
am:
8790fb2613
Change-Id: I8ccebdc05c7f280a101af02032d41413c198ef39
Mark Salyzyn [Tue, 10 Jan 2017 21:19:19 +0000 (21:19 +0000)]
Merge "liblog: use log/log.h for ALOG macros" am:
06d8feefec
am:
71bf335ffa
Change-Id: Id07d468c8e95af39e189f53919a0ac6aabc9604c
Mark Salyzyn [Tue, 10 Jan 2017 21:13:49 +0000 (21:13 +0000)]
Merge "liblog: use log/log.h for ALOG macros"
am:
06d8feefec
Change-Id: Ib5b1d8dbd98957bb409bece5be84dfb10f4b23fc
Treehugger Robot [Tue, 10 Jan 2017 21:06:23 +0000 (21:06 +0000)]
Merge "liblog: use log/log.h for ALOG macros"
Jack He [Thu, 8 Dec 2016 23:44:14 +0000 (15:44 -0800)]
Convert Android.mk in libaudioclient to Android.bp
* Since system/bt depends on this library, it needs to be converted to
Android.bp before the conversion in system/bt can be continued.
* Majority of work is done by androidmk Android.mk > Android.bp
* Fixed sanitize arguements
* Removed LOCAL_EXPORT_C_INCLUDE_DIRS as Android.bp only supports
exporting sub-directories of current Android.bp file
* Removed frameworks/av/media/libmedia/aidl include path as it no longer
exists and Android.mk failed to check that
* Removed include path for audio-utils as it is being automatically
included when we link against libaudioutils
* Android.mk file must be deleted as a library of the same name can only
be defined once in either Android.bp or Android.mk
* A library defined in Android.bp can be used by either Android.bp or
Android.mk files. However, a library defined in Android.mk cannot be
used by Android.bp file. Therefore, for system/bt to link against this
library in the Android.bp, this library must be converted first
Bug:
32958753
Test: Code compilation, no user visible effect
Change-Id: I2ae87a1151ed4235122c7774096c2dbff8b1fc62
Mark Salyzyn [Tue, 10 Jan 2017 17:08:19 +0000 (09:08 -0800)]
liblog: use log/log.h for ALOG macros
Test: compile
Bug:
30465923
Change-Id: I247151363604714088b6059279702702b4e9f89a
xiahong.bao [Tue, 10 Jan 2017 03:37:04 +0000 (03:37 +0000)]
Merge "MPEG4Write mdhd duration overflow after recording for 15 hours" am:
98d1217d58 am:
6afe508bb2
am:
3e383dc9cd
Change-Id: Ib3552a36d555021bd0ab2f1e68b588efc7f30213
xiahong.bao [Tue, 10 Jan 2017 03:32:03 +0000 (03:32 +0000)]
Merge "MPEG4Write mdhd duration overflow after recording for 15 hours" am:
98d1217d58
am:
6afe508bb2
Change-Id: Ib47fdde7f7b25a09bc76d9b43a937986ce9936e1
xiahong.bao [Tue, 10 Jan 2017 03:27:33 +0000 (03:27 +0000)]
Merge "MPEG4Write mdhd duration overflow after recording for 15 hours"
am:
98d1217d58
Change-Id: Ie69b03560152df6534a1564adb9c9698a6d4d668
Treehugger Robot [Tue, 10 Jan 2017 03:22:24 +0000 (03:22 +0000)]
Merge "MPEG4Write mdhd duration overflow after recording for 15 hours"
Jeff Tinker [Mon, 9 Jan 2017 16:10:48 +0000 (16:10 +0000)]
Merge "DO NOT MERGE Move legacy widevine classic global lock from framework to vendor/widevine implementation." into nyc-mr2-dev
am:
cb85a295a4
Change-Id: I81a62b4750ef8f151a217b932c045f3409c408d4
Jeff Tinker [Mon, 9 Jan 2017 16:10:46 +0000 (16:10 +0000)]
DO NOT MERGE Move legacy widevine classic global lock from framework to vendor/widevine implementation.
am:
08dbccd22d
Change-Id: Ic152c07bc890fa73dea0b53d7a9ca9dbf29d3224
Jeff Tinker [Mon, 9 Jan 2017 16:03:59 +0000 (16:03 +0000)]
Merge "DO NOT MERGE Move legacy widevine classic global lock from framework to vendor/widevine implementation." into nyc-mr2-dev
Andy Hung [Sat, 7 Jan 2017 04:12:04 +0000 (04:12 +0000)]
Merge "Add SSE optimization of FIR float filter" am:
5783c0a053 am:
440279f709
am:
61028e78a9
Change-Id: I562825a1a689bcbc4cbe0ef5f7ebf281985b1a13
Andy Hung [Sat, 7 Jan 2017 04:07:34 +0000 (04:07 +0000)]
Merge "Add SSE optimization of FIR float filter" am:
5783c0a053
am:
440279f709
Change-Id: I8d994318bf3e4c143a3a308ab98c3b6f9aed33e0
Andy Hung [Sat, 7 Jan 2017 04:03:35 +0000 (04:03 +0000)]
Merge "Add SSE optimization of FIR float filter"
am:
5783c0a053
Change-Id: I2c3472620e572b948406828f00011b47094fb0bd
Andy Hung [Sat, 7 Jan 2017 03:57:08 +0000 (03:57 +0000)]
Merge "Add SSE optimization of FIR float filter"
Dan Albert [Fri, 6 Jan 2017 20:54:15 +0000 (20:54 +0000)]
Merge "Unversion NDK stub libraries." am:
0b4540f867 am:
17eea8c807
am:
34df2b45c1
Change-Id: I86d832f16cff2445dc5c85e3f6c4419535b236ca
Dan Albert [Fri, 6 Jan 2017 20:50:15 +0000 (20:50 +0000)]
Merge "Unversion NDK stub libraries." am:
0b4540f867
am:
17eea8c807
Change-Id: Id21465810bf682dbc4ff75eaec8a6bc83b98a889
Dan Albert [Fri, 6 Jan 2017 20:46:44 +0000 (20:46 +0000)]
Merge "Unversion NDK stub libraries."
am:
0b4540f867
Change-Id: Icb81885c0846ee4f4ef24456d90ee46022c0fd00
Treehugger Robot [Fri, 6 Jan 2017 20:39:21 +0000 (20:39 +0000)]
Merge "Unversion NDK stub libraries."
Dan Albert [Fri, 6 Jan 2017 00:00:15 +0000 (16:00 -0800)]
Unversion NDK stub libraries.
The system versions of these libraries aren't versioned yet.
Bug: https://github.com/android-ndk/ndk/issues/278
Test: make ndk
Change-Id: I139f34217c8855a366ecb537bfabf2ca0181e4d3
Mark Salyzyn [Thu, 5 Jan 2017 17:05:48 +0000 (17:05 +0000)]
Merge "stagefright: parseApp check data boundary conditions" am:
ea73e1aef0 am:
046ac31f1f
am:
657ea05284
Change-Id: I7cc3ec2563527e5b04cdf97d993e0fa8cc6f7c42
Mark Salyzyn [Thu, 5 Jan 2017 17:02:18 +0000 (17:02 +0000)]
Merge "stagefright: parseApp check data boundary conditions" am:
ea73e1aef0
am:
046ac31f1f
Change-Id: I31065509366a84f2f1bfd90ba1c3d9b3d91aa1bf
Mark Salyzyn [Thu, 5 Jan 2017 16:58:48 +0000 (16:58 +0000)]
Merge "stagefright: parseApp check data boundary conditions"
am:
ea73e1aef0
Change-Id: Icd376d02b818001d8b83e7055b3f25469e29aabb
Treehugger Robot [Thu, 5 Jan 2017 16:56:08 +0000 (16:56 +0000)]
Merge "stagefright: parseApp check data boundary conditions"
Jerry Zhang [Thu, 5 Jan 2017 00:18:11 +0000 (00:18 +0000)]
Merge "Fix issue with 32 bit versions of asyncio" am:
71be3d9a6f am:
0500ce7ed2
am:
2347a1f847
Change-Id: I229fb80ead478a12c773e0154304bb48a52eaff2
Jerry Zhang [Thu, 5 Jan 2017 00:15:39 +0000 (00:15 +0000)]
Merge "Fix issue with 32 bit versions of asyncio" am:
71be3d9a6f
am:
0500ce7ed2
Change-Id: Ic8771054afb8c81f7ded84f9aa5b42af0356f167
Jerry Zhang [Thu, 5 Jan 2017 00:13:10 +0000 (00:13 +0000)]
Merge "Fix issue with 32 bit versions of asyncio"
am:
71be3d9a6f
Change-Id: I6d0bb90c36b47ccc8d50c3b38c910ab9943cc69f
Jerry Zhang [Thu, 5 Jan 2017 00:08:57 +0000 (00:08 +0000)]
Merge "Fix issue with 32 bit versions of asyncio"
Jerry Zhang [Tue, 3 Jan 2017 22:41:56 +0000 (14:41 -0800)]
Fix issue with 32 bit versions of asyncio
Assuming 64 bit long offsets caused 32 bit tests
to fail
Test: verified async_io_test passes on 32 and 64 bit
Bug:
33846003
Change-Id: I2db126068037f674beeacd5bc30364010c858350
Android Build Merger (Role) [Wed, 4 Jan 2017 22:50:16 +0000 (22:50 +0000)]
Merge "DO NOT MERGE - improve audio effect framwework thread safety am:
b47a5ab107 am:
26cf2f4d73 am:
73a152960b -s ours am:
21d6eafd26 -s ours am:
6c5deab4f2 am:
9685820100 -s ours am:
6608eddab9 am:
c6a7a42379 am:
d1b6293802 am:
1771044fd4 -s ours am:
9ddb80f888 am:
58a605ff7d am:
b132ba6071 am:
482341fa20 am:
6896c4afd1" into nyc-mr2-dev-plus-aosp
Eric Laurent [Wed, 4 Jan 2017 22:50:03 +0000 (22:50 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
b47a5ab107 am:
26cf2f4d73 am:
73a152960b -s ours am:
21d6eafd26 -s ours am:
6c5deab4f2 am:
9685820100 -s ours am:
6608eddab9 am:
c6a7a42379 am:
d1b6293802 am:
1771044fd4 -s ours am:
9ddb80f888 am:
58a605ff7d am:
b132ba6071 am:
482341fa20
am:
c8ab1a8da5
Change-Id: Ieca746d07f19d5597e0db42213499bbecd2b9e1c
Eric Laurent [Wed, 4 Jan 2017 22:50:03 +0000 (22:50 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
b47a5ab107 am:
26cf2f4d73 am:
73a152960b -s ours am:
21d6eafd26 -s ours am:
6c5deab4f2 am:
9685820100 -s ours am:
6608eddab9 am:
c6a7a42379 am:
d1b6293802 am:
1771044fd4 -s ours am:
9ddb80f888 am:
58a605ff7d am:
b132ba6071 am:
482341fa20
am:
6896c4afd1
Change-Id: I8f2efbd8f59ab86cb7a98525b3cbf93adc9c9f74
Eric Laurent [Wed, 4 Jan 2017 22:47:33 +0000 (22:47 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
b47a5ab107 am:
26cf2f4d73 am:
73a152960b -s ours am:
21d6eafd26 -s ours am:
6c5deab4f2 am:
9685820100 -s ours am:
6608eddab9 am:
c6a7a42379 am:
d1b6293802 am:
1771044fd4 -s ours am:
9ddb80f888 am:
58a605ff7d am:
b132ba6071
am:
482341fa20
Change-Id: I4824611a1e8492c0fd30e6955adc4cc9cb31aad0
Eric Laurent [Wed, 4 Jan 2017 22:47:33 +0000 (22:47 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
b47a5ab107 am:
26cf2f4d73 am:
73a152960b -s ours am:
21d6eafd26 -s ours am:
6c5deab4f2 am:
9685820100 -s ours am:
6608eddab9 am:
c6a7a42379 am:
d1b6293802 am:
1771044fd4 -s ours am:
9ddb80f888 am:
58a605ff7d am:
b132ba6071
am:
482341fa20
Change-Id: I995fddf1743734c056d8ad7e3da42a6e8e48de22
Eric Laurent [Wed, 4 Jan 2017 22:45:03 +0000 (22:45 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
b47a5ab107 am:
26cf2f4d73 am:
73a152960b -s ours am:
21d6eafd26 -s ours am:
6c5deab4f2 am:
9685820100 -s ours am:
6608eddab9 am:
c6a7a42379 am:
d1b6293802 am:
1771044fd4 -s ours am:
9ddb80f888 am:
58a605ff7d
am:
b132ba6071
Change-Id: I8311a618840a09438d82cb2f2e279577f594fb9c
Eric Laurent [Wed, 4 Jan 2017 22:42:32 +0000 (22:42 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
b47a5ab107 am:
26cf2f4d73 am:
73a152960b -s ours am:
21d6eafd26 -s ours am:
6c5deab4f2 am:
9685820100 -s ours am:
6608eddab9 am:
c6a7a42379 am:
d1b6293802 am:
1771044fd4 -s ours am:
9ddb80f888
am:
58a605ff7d
Change-Id: Ic6d7dbb0a039fae7eb9785cc4747120cba635bae
Android Build Merger (Role) [Wed, 4 Jan 2017 22:40:13 +0000 (22:40 +0000)]
Merge "DO NOT MERGE - improve audio effect framwework thread safety am:
84c392104e -s ours am:
5d5f9cd28a am:
10f61954ba -s ours am:
bb4c9408ec am:
642e5857fe am:
b763905a4f am:
eef8dc0294 -s ours am:
7454e9d217 am:
5acee4ff97 am:
e5de51e57c am:
2c543a3106 am:
e1befe676d" into nyc-mr2-dev-plus-aosp
Eric Laurent [Wed, 4 Jan 2017 22:40:01 +0000 (22:40 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
b47a5ab107 am:
26cf2f4d73 am:
73a152960b -s ours am:
21d6eafd26 -s ours am:
6c5deab4f2 am:
9685820100 -s ours am:
6608eddab9 am:
c6a7a42379 am:
d1b6293802 am:
1771044fd4 -s ours
am:
9ddb80f888
Change-Id: I6b9b857dc20a6d9645968aadb1d6f21a965ed843
Eric Laurent [Wed, 4 Jan 2017 22:40:01 +0000 (22:40 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
84c392104e -s ours am:
5d5f9cd28a am:
10f61954ba -s ours am:
bb4c9408ec am:
642e5857fe am:
b763905a4f am:
eef8dc0294 -s ours am:
7454e9d217 am:
5acee4ff97 am:
e5de51e57c am:
2c543a3106
am:
675565b0d9
Change-Id: Ib10fc4731e01073b656314f6f549f1642e9ba6c0
Eric Laurent [Wed, 4 Jan 2017 22:40:01 +0000 (22:40 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
84c392104e -s ours am:
5d5f9cd28a am:
10f61954ba -s ours am:
bb4c9408ec am:
642e5857fe am:
b763905a4f am:
eef8dc0294 -s ours am:
7454e9d217 am:
5acee4ff97 am:
e5de51e57c am:
2c543a3106
am:
e1befe676d
Change-Id: I08bf99fca58fd9d9bf0b130c432e25b4bd99f66a
Eric Laurent [Wed, 4 Jan 2017 22:37:31 +0000 (22:37 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
84c392104e -s ours am:
5d5f9cd28a am:
10f61954ba -s ours am:
bb4c9408ec am:
642e5857fe am:
b763905a4f am:
eef8dc0294 -s ours am:
7454e9d217 am:
5acee4ff97 am:
e5de51e57c
am:
2c543a3106
Change-Id: I03ebb5fa55c16ef9d151e1e22447e758675afa1b
Eric Laurent [Wed, 4 Jan 2017 22:37:31 +0000 (22:37 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
84c392104e -s ours am:
5d5f9cd28a am:
10f61954ba -s ours am:
bb4c9408ec am:
642e5857fe am:
b763905a4f am:
eef8dc0294 -s ours am:
7454e9d217 am:
5acee4ff97 am:
e5de51e57c
am:
2c543a3106
Change-Id: Ifd7b54c76d870eb8c94587015982166453b69300
Eric Laurent [Wed, 4 Jan 2017 22:37:31 +0000 (22:37 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
b47a5ab107 am:
26cf2f4d73 am:
73a152960b -s ours am:
21d6eafd26 -s ours am:
6c5deab4f2 am:
9685820100 -s ours am:
6608eddab9 am:
c6a7a42379 am:
d1b6293802
am:
1771044fd4 -s ours
Change-Id: Ic726e6af40883eed9cd15ffd57314c03bce03f1d
Eric Laurent [Wed, 4 Jan 2017 22:35:02 +0000 (22:35 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
b47a5ab107 am:
26cf2f4d73 am:
73a152960b -s ours am:
21d6eafd26 -s ours am:
6c5deab4f2 am:
9685820100 -s ours am:
6608eddab9 am:
c6a7a42379
am:
d1b6293802
Change-Id: Iec2ba59fd23c72b83efd444bba0e1024109b627c
Eric Laurent [Wed, 4 Jan 2017 22:35:01 +0000 (22:35 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
84c392104e -s ours am:
5d5f9cd28a am:
10f61954ba -s ours am:
bb4c9408ec am:
642e5857fe am:
b763905a4f am:
eef8dc0294 -s ours am:
7454e9d217 am:
5acee4ff97
am:
e5de51e57c
Change-Id: Ie4260a73818c13ed183b6191c29cc10e9a120d2f
Android Build Merger (Role) [Wed, 4 Jan 2017 22:32:41 +0000 (22:32 +0000)]
Merge "DO NOT MERGE - improve audio effect framwework thread safety am:
bc7f347ff5 am:
068881e79c am:
35912764e9 am:
d9e0deef93 -s ours am:
7bb8e04c67 am:
851361eda0 am:
43d30448c2 am:
eea5d5d23a am:
f4aaaf6ca7" into nyc-mr2-dev-plus-aosp
Eric Laurent [Wed, 4 Jan 2017 22:32:31 +0000 (22:32 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
84c392104e -s ours am:
5d5f9cd28a am:
10f61954ba -s ours am:
bb4c9408ec am:
642e5857fe am:
b763905a4f am:
eef8dc0294 -s ours am:
7454e9d217
am:
5acee4ff97
Change-Id: Ieac957751e5c0805bbe3c847e0e4818f872b6944
Eric Laurent [Wed, 4 Jan 2017 22:32:31 +0000 (22:32 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
b47a5ab107 am:
26cf2f4d73 am:
73a152960b -s ours am:
21d6eafd26 -s ours am:
6c5deab4f2 am:
9685820100 -s ours am:
6608eddab9
am:
c6a7a42379
Change-Id: I675bfc4d6c17c718f2411f415bf8e18d6601ab0a
Eric Laurent [Wed, 4 Jan 2017 22:32:31 +0000 (22:32 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
bc7f347ff5 am:
068881e79c am:
35912764e9 am:
d9e0deef93 -s ours am:
7bb8e04c67 am:
851361eda0 am:
43d30448c2 am:
eea5d5d23a
am:
8ba19b881d
Change-Id: Iac83d58a703f688f50a3d75d55ee0738b2ab184d
Eric Laurent [Wed, 4 Jan 2017 22:32:31 +0000 (22:32 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
bc7f347ff5 am:
068881e79c am:
35912764e9 am:
d9e0deef93 -s ours am:
7bb8e04c67 am:
851361eda0 am:
43d30448c2 am:
eea5d5d23a
am:
f4aaaf6ca7
Change-Id: Ief08f3c4cb343808793de22c48efc628c552b243
Eric Laurent [Wed, 4 Jan 2017 22:30:02 +0000 (22:30 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
84c392104e -s ours am:
5d5f9cd28a am:
10f61954ba -s ours am:
bb4c9408ec am:
642e5857fe am:
b763905a4f am:
eef8dc0294 -s ours
am:
7454e9d217
Change-Id: Idd5e7ddfa5f2c74e3ffe5ca8c83e4af594b5df14
Eric Laurent [Wed, 4 Jan 2017 22:30:01 +0000 (22:30 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
bc7f347ff5 am:
068881e79c am:
35912764e9 am:
d9e0deef93 -s ours am:
7bb8e04c67 am:
851361eda0 am:
43d30448c2
am:
eea5d5d23a
Change-Id: Ib7f35b02ecbfb637b254e0b4af89a3f36d99d6af
Eric Laurent [Wed, 4 Jan 2017 22:30:01 +0000 (22:30 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
bc7f347ff5 am:
068881e79c am:
35912764e9 am:
d9e0deef93 -s ours am:
7bb8e04c67 am:
851361eda0 am:
43d30448c2
am:
eea5d5d23a
Change-Id: I7bcda7a7549aa1107eaff5c0b590ea47baf76e86
Eric Laurent [Wed, 4 Jan 2017 22:30:01 +0000 (22:30 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
b47a5ab107 am:
26cf2f4d73 am:
73a152960b -s ours am:
21d6eafd26 -s ours am:
6c5deab4f2 am:
9685820100 -s ours
am:
6608eddab9
Change-Id: I90c4642628db7be0f6756885bb56b09b780bdbe3
Eric Laurent [Wed, 4 Jan 2017 22:28:30 +0000 (22:28 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
bc7f347ff5 am:
068881e79c am:
35912764e9 am:
d9e0deef93 -s ours am:
7bb8e04c67 am:
851361eda0
am:
43d30448c2
Change-Id: I541038e514c69b885050dcb2b1260f1454674550
Eric Laurent [Wed, 4 Jan 2017 22:28:29 +0000 (22:28 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
84c392104e -s ours am:
5d5f9cd28a am:
10f61954ba -s ours am:
bb4c9408ec am:
642e5857fe am:
b763905a4f
am:
eef8dc0294 -s ours
Change-Id: If09aa28d0491848e7d46cd1543817954935d7e96
Eric Laurent [Wed, 4 Jan 2017 22:27:59 +0000 (22:27 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
b47a5ab107 am:
26cf2f4d73 am:
73a152960b -s ours am:
21d6eafd26 -s ours am:
6c5deab4f2
am:
9685820100 -s ours
Change-Id: I84f3371cf4ac96e94b7f321b25fe51cf5e0cf4af
Eric Laurent [Wed, 4 Jan 2017 22:25:30 +0000 (22:25 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
84c392104e -s ours am:
5d5f9cd28a am:
10f61954ba -s ours am:
bb4c9408ec am:
642e5857fe
am:
b763905a4f
Change-Id: I14f1399192ca95dc061cae572455eedfc01fcefe
Eric Laurent [Wed, 4 Jan 2017 22:25:30 +0000 (22:25 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
bc7f347ff5 am:
068881e79c am:
35912764e9 am:
d9e0deef93 -s ours am:
7bb8e04c67
am:
851361eda0
Change-Id: Ie02e050387e13ccf1e20b675949a69299cd8b7ed
Eric Laurent [Wed, 4 Jan 2017 22:25:30 +0000 (22:25 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
b47a5ab107 am:
26cf2f4d73 am:
73a152960b -s ours am:
21d6eafd26 -s ours
am:
6c5deab4f2
Change-Id: I680ead77538594903bc5140f68eeb920a7ac39c0
Eric Laurent [Wed, 4 Jan 2017 22:22:59 +0000 (22:22 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
84c392104e -s ours am:
5d5f9cd28a am:
10f61954ba -s ours am:
bb4c9408ec
am:
642e5857fe
Change-Id: I105c98cc9d580a34aa6edbfbe4e58ce3cda966de
Eric Laurent [Wed, 4 Jan 2017 22:22:59 +0000 (22:22 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
bc7f347ff5 am:
068881e79c am:
35912764e9 am:
d9e0deef93 -s ours
am:
7bb8e04c67
Change-Id: I0bc0bb1c9f8a16433c73ed6085d544b6040e5321
Eric Laurent [Wed, 4 Jan 2017 22:22:59 +0000 (22:22 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
b47a5ab107 am:
26cf2f4d73 am:
73a152960b -s ours
am:
21d6eafd26 -s ours
Change-Id: I8ad30b3c76e746ed85dde65a841ebb17af519ce6
Eric Laurent [Wed, 4 Jan 2017 22:20:58 +0000 (22:20 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
bc7f347ff5 am:
068881e79c am:
35912764e9
am:
d9e0deef93 -s ours
Change-Id: I8bf018f1103c6201ad6dd54657449aceda052921
Eric Laurent [Wed, 4 Jan 2017 22:20:47 +0000 (22:20 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
b47a5ab107 am:
26cf2f4d73
am:
73a152960b -s ours
Change-Id: Id10c17b4bbdc1dd90a1cad25b6c697f8b6a0bcd0
Eric Laurent [Wed, 4 Jan 2017 22:20:30 +0000 (22:20 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
84c392104e -s ours am:
5d5f9cd28a am:
10f61954ba -s ours
am:
bb4c9408ec
Change-Id: Ifbee9dc70a27ff2f4e2d4641dca40914619fb185
Eric Laurent [Wed, 4 Jan 2017 22:18:00 +0000 (22:18 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
84c392104e -s ours am:
5d5f9cd28a
am:
10f61954ba -s ours
Change-Id: I8c86f95b8f3bdb4c20372207c55bffe9a43b5dbb
Eric Laurent [Wed, 4 Jan 2017 22:17:59 +0000 (22:17 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
bc7f347ff5 am:
068881e79c
am:
35912764e9
Change-Id: I9f13363bb537031a3c252c91efee911561cf1633
Eric Laurent [Wed, 4 Jan 2017 22:17:58 +0000 (22:17 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
b47a5ab107
am:
26cf2f4d73
Change-Id: I6513190cce6756c47e5ede0dc578fa0d2c5889b3
Eric Laurent [Wed, 4 Jan 2017 22:15:59 +0000 (22:15 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
84c392104e -s ours
am:
5d5f9cd28a
Change-Id: I3f732f9e0c346c0e7989e22401062011ef7c7ed2
Eric Laurent [Wed, 4 Jan 2017 22:15:58 +0000 (22:15 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am:
bc7f347ff5
am:
068881e79c
Change-Id: I03e5bd37b916c2b3390a20f59f69de8cf970b1db
Eric Laurent [Wed, 4 Jan 2017 22:15:29 +0000 (22:15 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety
am:
b47a5ab107
Change-Id: I46af7560653784852e771a2eefd581989aac0644
Eric Laurent [Wed, 4 Jan 2017 22:12:58 +0000 (22:12 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety
am:
84c392104e -s ours
Change-Id: Ia65e289c7383406c719226e8f404b392ca4303b2
Eric Laurent [Wed, 4 Jan 2017 22:12:58 +0000 (22:12 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety
am:
bc7f347ff5
Change-Id: I75cb2ddf4df152e740d773a4904b581b1ff5f811
OSDN Git Service
