summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Offer a type-safe album art interface.Elliott Hughes2014-06-118-84/+57
| | | | | | | | | | | | | | | | | | | | Bug: 15514223 Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
* | | | Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-102-3/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Add libcrypto for users of libstagefright.Christopher Ferris2014-06-102-3/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | libstagefright_rtsp uses some MD5 functions that used to be in bionic, but it was removed recently. As an initial fix, I statically linked in libcrypto_static to the libstagefright_rtsp library. However, I think it's better to modify the single user of this library to link against the shared libcrypto library. Change-Id: Iaf2e1aeea32fd8af038f6e77bf58ea7df50d807a
* | | Merge "Link libcrypto for MD5_* functions."Christopher Ferris2014-06-101-0/+7
|\ \ \
| * | | Link libcrypto for MD5_* functions.Christopher Ferris2014-06-091-0/+7
|/ / / | | | | | | | | | Change-Id: I5dce8f041b9faf035161b82d5e46bd46166bd05c
* | | Merge "libcamera_client: 64-bit compile issue"Mark Salyzyn2014-06-092-4/+4
|\ \ \ | |/ / |/| |
| * | libcamera_client: 64-bit compile issueMark Salyzyn2014-06-092-4/+4
|/ / | | | | | | | | | | | | - size_t print format - some unused parameter warning messages Change-Id: I2c0f50dda7e810f3f60603fd9d8c62c5b8767528
* | Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
|\ \
| * | Mp3decoder: Remove unused arm assembly filesAshok Bhat2014-05-275-1413/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The unused ARM assembly files were written for legacy proprietary ARM compilers. They are not needed when gcc or clang compiler is used. Change-Id: I8dfe9ad458efbb34922094e943ad334cc34f59a3 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
|\ \ \ | | | | | | | | | | | | | | | | * commit '2d0e8d8f75369b491362f2ea3a6efd5159df404c': libcpustats: Turn on -Werror
| * \ \ Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
| |\ \ \
| | * | | libcpustats: Turn on -WerrorMark Salyzyn2014-05-302-3/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Switch to static_assert from deprecated utils/Debug.h - Turn on C++11 standard - Turn on -Werror Change-Id: I4f1c08bbcaf1ad3a97502cde756a2f42bcece789
* | | | am df9b1ff3: Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'df9b1ff3726e263c8533add096435520ca4b7d61': Move to dalvik.vm.lib.2 to force default to libart
| * | | Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Bug: 14298175 (cherry picked from commit 483f59ab9fb4b2d8ab212f77a50eed0528beca58) Change-Id: I387af6e4721840f98063f26854c02e6da26b9974
* | | am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-222-4/+2
|\ \ \ | |/ / | | | | | | | | | * commit '8b187f4acea8d7e517ff9ced32fc7368bdbaa6e0': Move frameworks/av off <sys/atomics.h>.
| * | Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-222-4/+2
| |\ \
| | * | Move frameworks/av off <sys/atomics.h>.Elliott Hughes2014-05-222-4/+2
| |/ / | | | | | | | | | | | | Bug: 14903517 Change-Id: I92cdfc618d83fd914cfb558a07b1deae0255fccb
* | | am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."Calin Juravle2014-05-228-39/+39
|\ \ \ | |/ / | | | | | | | | | * commit 'd551633916d3677da4dda10aba6837bdc6803ee0': Move frameworks/av from fdprintf to POSIX dprintf.
| * | Merge "Move frameworks/av from fdprintf to POSIX dprintf."Calin Juravle2014-05-228-39/+39
| |\ \
| | * | Move frameworks/av from fdprintf to POSIX dprintf.Elliott Hughes2014-05-228-39/+39
| |/ / | | | | | | | | | | | | Bug: 11156955 Change-Id: Ia98cd16b4c1f7be87cf060b7456de4f40896bacb
* | | am 85e6e87c: Merge "Restore accidentally-removed NULL timeout."Elliott Hughes2014-05-221-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '85e6e87c41bba51729cee8958a5c30157c8dc674': Restore accidentally-removed NULL timeout.
| * | Merge "Restore accidentally-removed NULL timeout."Elliott Hughes2014-05-221-1/+1
| |\ \
| | * | Restore accidentally-removed NULL timeout.Elliott Hughes2014-05-211-1/+1
| |/ / | | | | | | | | | Change-Id: I933c80fea50950243f109acf8d6350013aaa811f
* | | am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-225-39/+39
|\ \ \ | |/ / | | | | | | | | | * commit '3b6da6bfb50a1c0324fb4c87326d3a477944d5fe': Move frameworks/av off private API.
| * | Merge "Move frameworks/av off private API."Elliott Hughes2014-05-225-39/+39
| |\ \
| | * | Move frameworks/av off private API.Elliott Hughes2014-05-215-39/+39
| |/ / | | | | | | | | | | | | Bug: 11156955 Change-Id: Ib3bb9d66a2bf92977c2445b62aa074a2d7a45aea
* | | am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-223-14/+14
|\ \ \ | |/ / | | | | | | | | | * commit 'd084206d5a4a5364211af46e4201311933e83bfc': Move frameworks/av off __futex_syscall3.
| * | Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-223-14/+14
| |\ \
| | * | Move frameworks/av off __futex_syscall3.Elliott Hughes2014-05-213-14/+14
| |/ / | | | | | | | | | | | | Bug: 11156955 Change-Id: I943080bc51b6efa781059b48b5b5ecc4fa287512
* | | am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL ↵Eric Laurent2014-05-191-1/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | when offloaded HAL is running BLOCKING mode" * commit 'ce473c32705e2d1c5fcc817198101e1220b3c8f7': Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode
| * | Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when ↵Eric Laurent2014-05-191-1/+4
| |\ \ | | | | | | | | | | | | offloaded HAL is running BLOCKING mode"
| | * | Codec Offload: Add NULL check as mCallbackThread is NULLUday Gupta2014-05-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when offloaded HAL is running BLOCKING mode b/14897952 Change-Id: I159a33e1181c1a62d80ab4bd3337a35dafaad884 Signed-off-by: Uday Gupta <guptau@broadcom.com> Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
* | | | am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale ↵Andreas Huber2014-05-161-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | warning" * commit '3059e27d0e18a427f3c19889aac86ea31ec0d5d1': libstagefright foundation: fix uninitialized varibale warning
| * | | Merge "libstagefright foundation: fix uninitialized varibale warning"Andreas Huber2014-05-161-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | libstagefright foundation: fix uninitialized varibale warningAmit Pundir2014-05-151-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | gcc-4.9 reports warning for this uninitialized variable and -Werror make this warning fatal. Change-Id: I6901362246d53deeded78fa38ad656b167705346 Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
* | | am f02f06c4: Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
|\ \ \ | |/ / | | | | | | | | | * commit 'f02f06c422a58ddaca49d14f21a196eaa435d07b': camera: check Intent entry count before reading it
| * | Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
| |\ \
| | * | camera: check Intent entry count before reading itYuvraj Pasi2014-05-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In case when find() returns empty entry, blindly reading the entry will cause segfault Change-Id: Ib5be7fd855c409ba3b45f0d43e15237367172817
* | | | am 1d2909b3: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-086-27/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '1d2909b38f76d9d866e61cf505b88518d3a52acf': Remove unused LOCAL_LDLIBS.
| * | | Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-086-27/+0
| |\ \ \
| | * | | Remove unused LOCAL_LDLIBS.Ying Wang2014-05-086-27/+0
| |/ / / | | | | | | | | | | | | Change-Id: I14865bee99fbcc5188b64fbd22bb49a1947ec6ff
* | | | am 8fb04d47: Merge "Fix memory leak when filtering commands in ↵Eric Laurent2014-05-062-10/+27
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | insertCommand_l()" * commit '8fb04d474ed9e0d1302ae223ee76fafbe5fb41a3': Fix memory leak when filtering commands in insertCommand_l()
| * | | Merge "Fix memory leak when filtering commands in insertCommand_l()"Eric Laurent2014-05-062-10/+27
| |\ \ \
| | * | | Fix memory leak when filtering commands in insertCommand_l()Jesper Tragardh2014-04-112-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When AudioPolicyService::AudioCommandThread::insertCommand_l filters a command from the queue, the AudioCommand* is removed from the vector mAudioCommands by calling mAudioCommands.removeAt(). This will destroy the pointer and compact the vector, but not delete the AudioCommand object. This patch adds code to delete a filtered out AudioCommand and its data object mParam. However, mParam was void* and deleting a void pointer is undefined behavior according to the C++ standard. Therefore, the data classes are modified to inherit from an abstract base class with a virtual destructor. The deletion of non-filtered commands in AudioPolicyService::AudioCommandThread::threadLoop() was already correct, as each case casts mParam to the proper type before deleting. This also fixes AOSP issue 36370. Change-Id: I2b63838aff3608132aa496f964a929f78c4b6267
* | | | | am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'b231408849158baea8dddc0edf7e97fcfc2e3240': AwesomePlayer: use PTS for queueBuffer
| * | | | Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
| |\ \ \ \
| | * | | | AwesomePlayer: use PTS for queueBufferLajos Molnar2014-05-011-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1c14ad4784c799c46cf06a14b0f00c5e4d01f718
* | | | | | am b52675e9: Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'b52675e9e3b2cfd7ca3ec4eda80dde77dee9dafb': Smooth out AwesomePlayer
| * | | | | Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
| |\ \ \ \ \ | | |/ / / /