OSDN Git Service
TreeHugger Robot [Mon, 9 Jan 2017 22:31:58 +0000 (22:31 +0000)]
Merge "libstagefright: Add NULL check during memcpy for MediaCodecSource"
Ray Essick [Mon, 9 Jan 2017 21:31:43 +0000 (21:31 +0000)]
Merge "Initial Metrics for Media.player"
Haynes Mathew George [Sat, 7 Jan 2017 00:56:53 +0000 (16:56 -0800)]
libstagefright: Add NULL check during memcpy for MediaCodecSource
Add null check for the source buffer prior to memcpy.
Test: compiles
Change-Id: I5971e0c01fd4821078780c9623154e396f679357
CRs-Fixed:
1096369
authored-by: Garmond Leung<garmondl@codeaurora.org>
(cherry picked from commit
85bb3ddece3140a59e1ecb25187e0d69fe85f002)
Steven Moreland [Fri, 6 Jan 2017 19:06:33 +0000 (11:06 -0800)]
Remove usage of getStatus.
- remove from libaudiohal
- remove from services/radio
- remove from soundtrigger
- remove from omx
Bug:
31348667
Test: compiles
Change-Id: I75bb7b7388527dacfdc5bf128712cb8690bc286b
Jeff Tinker [Mon, 9 Jan 2017 16:15:24 +0000 (16:15 +0000)]
Merge "DO NOT MERGE Move legacy widevine classic global lock from framework to vendor/widevine implementation." into nyc-mr2-dev am:
cb85a295a4
am:
cb09e6302f -s ours
Change-Id: I5bdcb58c8553131a441350d120ead0223324d39b
Jeff Tinker [Mon, 9 Jan 2017 16:15:17 +0000 (16:15 +0000)]
DO NOT MERGE Move legacy widevine classic global lock from framework to vendor/widevine implementation. am:
08dbccd22d
am:
0623c27ff2 -s ours
Change-Id: Ic32540e13b92f6d59d6eb12ef895c0ce579eb271
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
Tomasz Wasilczyk [Sat, 7 Jan 2017 20:03:40 +0000 (20:03 +0000)]
Merge "Make metadata field mandatory for program info struct."
Andy Hung [Sat, 7 Jan 2017 04:16:05 +0000 (04:16 +0000)]
Merge "Add SSE optimization of FIR float filter" am:
5783c0a053 am:
440279f709 am:
61028e78a9
am:
b20b027d86
Change-Id: Ibde0e3f33a88431a009b7f0550a8fd12c346037e
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"
Andy Hung [Sat, 7 Jan 2017 03:14:18 +0000 (03:14 +0000)]
Merge "AudioResampler: Add mono stopband tests"
Andy Hung [Sat, 7 Jan 2017 03:13:41 +0000 (03:13 +0000)]
Merge "AudioResampler: Workaround for Clang assembly bug"
Andy Hung [Sat, 7 Jan 2017 03:13:21 +0000 (03:13 +0000)]
Merge "AudioResampler: Fix intrinsic integer mode for 64b"
Andy Hung [Sat, 7 Jan 2017 02:28:10 +0000 (02:28 +0000)]
Merge "AudioFlinger: Fix resampler tests"
Andy Hung [Fri, 6 Jan 2017 01:26:08 +0000 (17:26 -0800)]
AudioResampler: Add mono stopband tests
Test: Native audioresampler test on Pixel XL
Change-Id: I4a36df1ca0e6b5bfb3b352f4bd16ed7697448031
Andy Hung [Fri, 6 Jan 2017 01:11:19 +0000 (17:11 -0800)]
AudioResampler: Workaround for Clang assembly bug
Used to work on M with gcc.
Test: Native audioresampler tests on Pixel XL disabling NEON
Bug:
34110890
Change-Id: Ibaaaf9ed833a37a9017a3217d31cb5ced6fa2c82
Andy Hung [Fri, 6 Jan 2017 00:59:20 +0000 (16:59 -0800)]
AudioResampler: Fix intrinsic integer mode for 64b
For legacy compatibility in 64 bit resampling mode (doubly
unlikely to be used, but we should still fix it).
Test: Native audioresampler tests on Pixel XL
Bug:
27174404
Change-Id: Ia65a0c6aa4255f0fb62f16d05a225ded58373f8e
Andy Hung [Fri, 6 Jan 2017 00:43:35 +0000 (16:43 -0800)]
AudioFlinger: Fix resampler tests
Test: Run resampler tests on Pixel XL
Bug:
34113617
Change-Id: Idee23b90bd1a353f841beab95c74a7b0ddb13783
Glenn Kasten [Fri, 6 Jan 2017 23:50:50 +0000 (23:50 +0000)]
Merge "media.log: re-implement NBLog using audio_utils_fifo"
Tomasz Wasilczyk [Fri, 6 Jan 2017 22:17:04 +0000 (14:17 -0800)]
Make metadata field mandatory for program info struct.
Test: VTS, manual
Change-Id: I3e4ed1f203dc28315d7c7db10c9ce3d83e4ec59d
TreeHugger Robot [Fri, 6 Jan 2017 21:07:01 +0000 (21:07 +0000)]
Merge "Unversion NDK stub libraries."
Dan Albert [Fri, 6 Jan 2017 20:58:17 +0000 (20:58 +0000)]
Merge "Unversion NDK stub libraries." am:
0b4540f867 am:
17eea8c807 am:
34df2b45c1
am:
3c1d987a05
Change-Id: I985aae1a055c6684e791815e8fef90ff0f5e4ca3
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."
Ray Essick [Tue, 3 Jan 2017 17:36:27 +0000 (09:36 -0800)]
Initial Metrics for Media.player
First round of logging metrics for media player. This marks
mime types, resolution, frames/time played, duration of media.
Expect more data in the future.
Bug:
33547820
Test: run player, observe captured log
Change-Id: I7bbfaf19e44113f4f285edb72f099b725beace72
Dan Albert [Fri, 6 Jan 2017 19:26:27 +0000 (11:26 -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: I1aa674433bea241dfd863a0382df6d59d067f282
TreeHugger Robot [Fri, 6 Jan 2017 02:24:14 +0000 (02:24 +0000)]
Merge changes from topics 'camera-hidl-service-2', 'camera-hidl-service'
* changes:
Camera: patching camera service for treble
Camera: Update camera service to use new HIDL HALs, part 2
Camera: Update camera service to use new HIDL HALs, part 1
TreeHugger Robot [Fri, 6 Jan 2017 01:26:47 +0000 (01:26 +0000)]
Merge "Revert "MediaCodec refactoring part 2-b: introduce BufferChannel""
Yin-Chia Yeh [Fri, 23 Dec 2016 02:20:43 +0000 (18:20 -0800)]
Camera: patching camera service for treble
Bug:
30985004
Change-Id: Idf3ec26abb6b10a0e3839e301e84c8b05ac165c5
Mikhail Naganov [Fri, 6 Jan 2017 00:37:48 +0000 (00:37 +0000)]
Merge "Re-implement HIDL stream read and write using FMQ"
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
Wonsik Kim [Thu, 5 Jan 2017 23:37:13 +0000 (23:37 +0000)]
Revert "MediaCodec refactoring part 2-b: introduce BufferChannel"
Bug:
34059849
This reverts commit
11b72100e02e02b6cd8a6b14cd2068c96dc49b7d.
Change-Id: I0ab93a617477861a4e6f43152e6b03d5c88783ab
Eino-Ville Talvala [Tue, 20 Dec 2016 00:29:17 +0000 (16:29 -0800)]
Camera: Update camera service to use new HIDL HALs, part 2
- Use string for device ID in Camera3Device
- Remove camera3_device_t parameter from Camera3Stream::finishConfiguration
- Disables ability for the stream to register buffers
- This means device HALv3.0 and v3.1 are no longer supported
- Add HIDL support to Camera3Device:
- Add HalInterface class to abstract whether legacy or HIDL HAL is in use
- TODO
- CameraHardwareInterface
- Switch to using HIDL definitions instead of camera3.h definitions in
main body of code
Test: Compiles
Bug:
30985004
Bug:
32991422
Change-Id: I9c3c0f7b7ea5d1d74e14b1d882779e3b9445da69
Eino-Ville Talvala [Tue, 13 Dec 2016 19:29:54 +0000 (11:29 -0800)]
Camera: Update camera service to use new HIDL HALs, part 1
- Add CameraProviderManager
- Enumerates individual camera provider HAL instances, as well
as the devices they provide
- Handles dynamic provider and device appearance/disappearance
- Maps device names to public API namespace
- Add unit tests for CameraProviderManager
- Add logic to enable new HIDL path
- Switch various bits of service internals to use string camera IDs,
though leaving most camera1-facing bits using int IDs, since that's
what the old API uses.
- Update CameraService to use CameraProviderManager instead of
the legacy camera HAL
- Update clients to pass through provider manager to devices instead
of just camera module
- Still TODO:
- Update Camera3Device to use new HIDL interface
- Update CameraHardwareInterface to use new HIDL interface
- Update dump()
- Update vendor tag handling
Test: New unit tests pass, camera CTS passes with Treble disabled
Bug:
30985004
Bug:
32991422
Change-Id: I7ac41f13b9501d5e53256e28c0465ec70aa3980e
Mark Salyzyn [Thu, 5 Jan 2017 17:08:49 +0000 (17:08 +0000)]
Merge "stagefright: parseApp check data boundary conditions" am:
ea73e1aef0 am:
046ac31f1f am:
657ea05284
am:
fd23328561
Change-Id: I63e5e2696006f960321087289d34b57acfde4937
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"
Mikhail Naganov [Thu, 22 Dec 2016 17:22:45 +0000 (09:22 -0800)]
Re-implement HIDL stream read and write using FMQ
Result: no hwbinder calls due read / write session.
Test: make, perform Loopback RTT, check traces
Bug:
30222631
Change-Id: I4a8792525ec374111302cfd5c0a2e41f9f4cc418
Jerry Zhang [Thu, 5 Jan 2017 00:20:41 +0000 (00:20 +0000)]
Merge "Fix issue with 32 bit versions of asyncio" am:
71be3d9a6f am:
0500ce7ed2 am:
2347a1f847
am:
8706043acc
Change-Id: I779cf3078e76ee7e4245d41fe935309958829205
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
Eric Laurent [Wed, 4 Jan 2017 22:52:54 +0000 (22:52 +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
am:
8be99dc25a -s ours
Change-Id: I49c394d6bd2465c79c6795290d46019f890892e2
Eric Laurent [Wed, 4 Jan 2017 22:52:53 +0000 (22:52 +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
am:
0a2aaafe45 -s ours
Change-Id: Iaf354c1fbb2e8cf2c71c59d99565baa3473550d2
Eric Laurent [Wed, 4 Jan 2017 22:52:33 +0000 (22:52 +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
am:
a3ea3450ee -s ours
Change-Id: Ia5d06affc2286b78bb7ef2bb1c3182776aa7ef7a
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:
6896c4afd1
Change-Id: I8f2efbd8f59ab86cb7a98525b3cbf93adc9c9f74
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: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:50 +0000 (22:42 +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
am:
3cd6428e09 -s ours
Change-Id: Ia012891ac60fb970390baea36ecf62853b037108
Eric Laurent [Wed, 4 Jan 2017 22:42:49 +0000 (22:42 +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
am:
07d0a9369d -s ours
Change-Id: I216eb1c2e5648ec6997f1705149390f5e9db32e5
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
Eric Laurent [Wed, 4 Jan 2017 22:42:31 +0000 (22:42 +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
am:
6b4a8425d1 -s ours
Change-Id: I6c11cc2da012edc7ac6dd298adb77bc8f0bc47c2
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:
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: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: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:18 +0000 (22:35 +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
am:
d5cd1bc581 -s ours
Change-Id: I55304595ec6d7ae66aef64ce75b0ecd6abc80015
Eric Laurent [Wed, 4 Jan 2017 22:35:18 +0000 (22:35 +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
am:
6fee640115 -s ours
Change-Id: I7799c875c38b69266fc56867c12a325cfc4a94a3
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
Eric Laurent [Wed, 4 Jan 2017 22:35:00 +0000 (22:35 +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
am:
10b7776913 -s ours
Change-Id: I6b5e4c2f60c68c6652a83a9220f9873f0933b5c5
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:
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: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: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
OSDN Git Service
