OSDN Git Service
Lajos Molnar [Tue, 24 Jun 2014 19:35:30 +0000 (19:35 +0000)]
am
87c47b0d: (-s ours) am
bc0c2c2d: (-s ours) Merge "DO NOT MERGE: Fix for SW video decoder OMX profile/level query"
* commit '
87c47b0d1c2df3e8630eb1b78fe303cfb24b3ad5':
DO NOT MERGE: Fix for SW video decoder OMX profile/level query
Mark Salyzyn [Tue, 24 Jun 2014 19:35:26 +0000 (19:35 +0000)]
am
940c688d: Merge "libmediaplayerservice: unused argument warning messages"
* commit '
940c688d76828ffd83929c661e75b5197903d30f':
libmediaplayerservice: unused argument warning messages
Lajos Molnar [Tue, 24 Jun 2014 18:00:29 +0000 (18:00 +0000)]
am
bc0c2c2d: (-s ours) Merge "DO NOT MERGE: Fix for SW video decoder OMX profile/level query"
* commit '
bc0c2c2d2a4cc058ab404f940f0ca65f595e047b':
DO NOT MERGE: Fix for SW video decoder OMX profile/level query
Lajos Molnar [Tue, 24 Jun 2014 17:56:00 +0000 (17:56 +0000)]
Merge "DO NOT MERGE: Fix for SW video decoder OMX profile/level query"
Xiaosong Wei [Tue, 17 Dec 2013 15:05:29 +0000 (23:05 +0800)]
DO NOT MERGE: Fix for SW video decoder OMX profile/level query
get the correct profile index from the input param and pass it to
profileLevel array to get the corresponding profile/level
Change-Id: I582961c0afb53c1781af7fb94226a23e5fdb96cf
Signed-off-by: Xiaosong Wei <xiaosong.wei@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Mark Salyzyn [Tue, 24 Jun 2014 17:12:19 +0000 (17:12 +0000)]
Merge "libmediaplayerservice: unused argument warning messages"
Mark Salyzyn [Mon, 23 Jun 2014 21:14:40 +0000 (14:14 -0700)]
libmediaplayerservice: unused argument warning messages
Change-Id: I7dbf62858114ac9b8de6d7b66cc00e002769a5cf
Marco Nelissen [Mon, 23 Jun 2014 19:48:55 +0000 (19:48 +0000)]
am
da69fdbb: Merge "Fix buffer allocation"
* commit '
da69fdbbeb79885a3c063a2017bd6d2848fcc312':
Fix buffer allocation
Marco Nelissen [Mon, 23 Jun 2014 18:23:22 +0000 (18:23 +0000)]
Merge "Fix buffer allocation"
Marco Nelissen [Mon, 23 Jun 2014 15:15:13 +0000 (08:15 -0700)]
Fix buffer allocation
b/
15293123
Change-Id: Icb3ceabf02a55bc931baaf388ce125db6332de0e
Eino-Ville Talvala [Fri, 20 Jun 2014 19:48:21 +0000 (19:48 +0000)]
am
06508824: am
f0d8468d: DO NOT MERGE: CameraService: Fix permissions check issues
* commit '
06508824dc699c566bc4ffbd816b2227fba15379':
DO NOT MERGE: CameraService: Fix permissions check issues
Eino-Ville Talvala [Thu, 19 Jun 2014 23:33:15 +0000 (23:33 +0000)]
am
f0d8468d: DO NOT MERGE: CameraService: Fix permissions check issues
* commit '
f0d8468dcec08e1ac4edf62ec7da5782a0b84d93':
DO NOT MERGE: CameraService: Fix permissions check issues
Eino-Ville Talvala [Tue, 17 Jun 2014 02:21:12 +0000 (19:21 -0700)]
DO NOT MERGE: CameraService: Fix permissions check issues
Bug:
15677063
Change-Id: I012c111fff90fefd9eb0fef7c9d6034f00c9c6df
Elliott Hughes [Fri, 13 Jun 2014 15:34:16 +0000 (15:34 +0000)]
am
ccaffa8d: Merge "Use char x[] rather than char x[0]."
* commit '
ccaffa8df0e201da6bfabb6d616e62904cfb5534':
Use char x[] rather than char x[0].
Narayan Kamath [Fri, 13 Jun 2014 10:22:28 +0000 (10:22 +0000)]
am
90732a3b: Merge "Remove dependency on Parcel::{read,write}IntPtr"
* commit '
90732a3be5e70156486aca94bde8aa81106329ba':
Remove dependency on Parcel::{read,write}IntPtr
Narayan Kamath [Fri, 13 Jun 2014 10:19:14 +0000 (11:19 +0100)]
resolved conflicts for merge of
cbd74fcb to klp-modular-dev-plus-aosp
Change-Id: I00270ef6fe813c0d3649483cbc3aba6af789e033
Elliott Hughes [Fri, 13 Jun 2014 15:27:25 +0000 (15:27 +0000)]
Merge "Use char x[] rather than char x[0]."
Elliott Hughes [Fri, 13 Jun 2014 01:17:11 +0000 (18:17 -0700)]
Use char x[] rather than char x[0].
Bug:
15514223
Change-Id: I895ea8ef7e391fd14cdf8976e048385e01c90f8f
Elliott Hughes [Thu, 12 Jun 2014 00:06:25 +0000 (00:06 +0000)]
am
c323737d: Merge "Offer a type-safe album art interface."
* commit '
c323737dd46d724b4c1ec230b283f26ae2a22b4f':
Offer a type-safe album art interface.
Narayan Kamath [Fri, 13 Jun 2014 08:55:13 +0000 (08:55 +0000)]
Merge "Update OMX messages for 64 bit"
Andy Hung [Fri, 2 May 2014 18:05:04 +0000 (11:05 -0700)]
Update OMX messages for 64 bit
Change node_id and buffer_id to uint32_t.
Ensure IOMX messages are fixed size.
Remove 64 bit compile warnings in associated files.
Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203
Signed-off-by: Andy Hung <hunga@google.com>
Elliott Hughes [Wed, 11 Jun 2014 23:59:18 +0000 (23:59 +0000)]
Merge "Offer a type-safe album art interface."
Elliott Hughes [Tue, 10 Jun 2014 23:55:38 +0000 (16:55 -0700)]
Offer a type-safe album art interface.
Bug:
15514223
Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
Christopher Ferris [Tue, 10 Jun 2014 23:46:41 +0000 (23:46 +0000)]
am
8d6d8f54: Merge "Add libcrypto for users of libstagefright."
* commit '
8d6d8f546c1d6c55b79b454c720c03a80c738444':
Add libcrypto for users of libstagefright.
Christopher Ferris [Tue, 10 Jun 2014 23:42:20 +0000 (23:42 +0000)]
Merge "Add libcrypto for users of libstagefright."
Christopher Ferris [Tue, 10 Jun 2014 22:15:04 +0000 (15:15 -0700)]
Add libcrypto for users of libstagefright.
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
Narayan Kamath [Fri, 13 Jun 2014 09:26:30 +0000 (09:26 +0000)]
Merge "Remove dependency on Parcel::{read,write}IntPtr"
Jeff Tinker [Mon, 9 Jun 2014 22:51:38 +0000 (15:51 -0700)]
Remove dependency on Parcel::{read,write}IntPtr
bug:
15424960
bug:
15107693
(cherry picked from commit
bcca9e072c1f288a53ce6862936f57dc36488f96)
Change-Id: I3ba59fccb184e99a07f6f82ccdbd00e5204901f6
Christopher Ferris [Tue, 10 Jun 2014 03:11:18 +0000 (03:11 +0000)]
am
d3af4265: Merge "Link libcrypto for MD5_* functions."
* commit '
d3af4265dca4c8ebcead5376f1c73a5dafc34778':
Link libcrypto for MD5_* functions.
Christopher Ferris [Tue, 10 Jun 2014 03:03:50 +0000 (03:03 +0000)]
Merge "Link libcrypto for MD5_* functions."
Christopher Ferris [Tue, 10 Jun 2014 02:35:17 +0000 (19:35 -0700)]
Link libcrypto for MD5_* functions.
Change-Id: I5dce8f041b9faf035161b82d5e46bd46166bd05c
Mark Salyzyn [Mon, 9 Jun 2014 23:41:55 +0000 (23:41 +0000)]
am
1f15b117: Merge "libcamera_client: 64-bit compile issue"
* commit '
1f15b117db93c664de935be7a369878a5bc78bb9':
libcamera_client: 64-bit compile issue
Mark Salyzyn [Mon, 9 Jun 2014 23:36:17 +0000 (23:36 +0000)]
Merge "libcamera_client: 64-bit compile issue"
Mark Salyzyn [Mon, 9 Jun 2014 23:28:21 +0000 (16:28 -0700)]
libcamera_client: 64-bit compile issue
- size_t print format
- some unused parameter warning messages
Change-Id: I2c0f50dda7e810f3f60603fd9d8c62c5b8767528
Adam Lesinski [Mon, 9 Jun 2014 21:12:44 +0000 (21:12 +0000)]
am
940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev
* commit '
940f8be3619cecda66dad33f995904795df88c2d':
Implement a NoOp DrmManagerClientImpl when no DRM service exists
Adam Lesinski [Fri, 6 Jun 2014 21:13:00 +0000 (21:13 +0000)]
Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev
Adam Lesinski [Wed, 4 Jun 2014 22:14:03 +0000 (15:14 -0700)]
Implement a NoOp DrmManagerClientImpl when no DRM service exists
Change-Id: Ib06f429102a51c540c8132f3397130328279e03a
Lajos Molnar [Thu, 5 Jun 2014 14:39:59 +0000 (14:39 +0000)]
am
17a6dd60: DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor
* commit '
17a6dd60f5f8a28af1db451bcbf44805648c844a':
DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor
Narayan Kamath [Tue, 3 Jun 2014 08:56:40 +0000 (08:56 +0000)]
am
05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"
* commit '
05eaf105a2a1445c2c13801ee4533ded47f1df1b':
Mp3decoder: Remove unused arm assembly files
Narayan Kamath [Tue, 3 Jun 2014 08:35:10 +0000 (08:35 +0000)]
Merge "Mp3decoder: Remove unused arm assembly files"
Mark Salyzyn [Fri, 30 May 2014 21:51:00 +0000 (21:51 +0000)]
am
6ed77c13: am
2d0e8d8f: Merge "libcpustats: Turn on -Werror"
* commit '
6ed77c130d80fe607ec91ada4cf5718d512b4ad5':
libcpustats: Turn on -Werror
Mark Salyzyn [Fri, 30 May 2014 21:47:19 +0000 (21:47 +0000)]
am
2d0e8d8f: Merge "libcpustats: Turn on -Werror"
* commit '
2d0e8d8f75369b491362f2ea3a6efd5159df404c':
libcpustats: Turn on -Werror
Mark Salyzyn [Fri, 30 May 2014 21:42:54 +0000 (21:42 +0000)]
Merge "libcpustats: Turn on -Werror"
Mark Salyzyn [Fri, 30 May 2014 20:30:18 +0000 (13:30 -0700)]
libcpustats: Turn on -Werror
- Switch to static_assert from deprecated utils/Debug.h
- Turn on C++11 standard
- Turn on -Werror
Change-Id: I4f1c08bbcaf1ad3a97502cde756a2f42bcece789
Lajos Molnar [Thu, 29 May 2014 14:34:59 +0000 (07:34 -0700)]
DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor
Bug:
15320804
Change-Id: I1c2f0f75aeaabc20cb94e79e47b70f7faefe0a9e
Brian Carlstrom [Wed, 28 May 2014 23:13:25 +0000 (23:13 +0000)]
am
215f7b91: am
df9b1ff3: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
215f7b91ed831e6d37909ead1119dcde13d50895':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:31:41 +0000 (22:31 +0000)]
am
df9b1ff3: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
df9b1ff3726e263c8533add096435520ca4b7d61':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:28:37 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
(cherry picked from commit
483f59ab9fb4b2d8ab212f77a50eed0528beca58)
Change-Id: I387af6e4721840f98063f26854c02e6da26b9974
Ashok Bhat [Fri, 23 May 2014 09:54:24 +0000 (10:54 +0100)]
Mp3decoder: Remove unused arm assembly files
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>
Elliott Hughes [Thu, 22 May 2014 22:50:51 +0000 (22:50 +0000)]
am
5b756bfd: am
8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."
* commit '
5b756bfdaa27c8b606720544bf507213cf47376d':
Move frameworks/av off <sys/atomics.h>.
Elliott Hughes [Thu, 22 May 2014 22:42:46 +0000 (22:42 +0000)]
am
8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."
* commit '
8b187f4acea8d7e517ff9ced32fc7368bdbaa6e0':
Move frameworks/av off <sys/atomics.h>.
Elliott Hughes [Thu, 22 May 2014 21:30:25 +0000 (21:30 +0000)]
Merge "Move frameworks/av off <sys/atomics.h>."
Elliott Hughes [Thu, 22 May 2014 21:20:39 +0000 (14:20 -0700)]
Move frameworks/av off <sys/atomics.h>.
Bug:
14903517
Change-Id: I92cdfc618d83fd914cfb558a07b1deae0255fccb
Calin Juravle [Thu, 22 May 2014 13:44:20 +0000 (13:44 +0000)]
am
c10b874c: am
d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."
* commit '
c10b874c4d0d6208fb93a7aa0dc8af4418faad45':
Move frameworks/av from fdprintf to POSIX dprintf.
Calin Juravle [Thu, 22 May 2014 13:40:35 +0000 (13:40 +0000)]
am
d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."
* commit '
d551633916d3677da4dda10aba6837bdc6803ee0':
Move frameworks/av from fdprintf to POSIX dprintf.
Calin Juravle [Thu, 22 May 2014 13:36:22 +0000 (13:36 +0000)]
Merge "Move frameworks/av from fdprintf to POSIX dprintf."
Elliott Hughes [Thu, 22 May 2014 08:22:06 +0000 (01:22 -0700)]
Move frameworks/av from fdprintf to POSIX dprintf.
Bug:
11156955
Change-Id: Ia98cd16b4c1f7be87cf060b7456de4f40896bacb
Elliott Hughes [Thu, 22 May 2014 01:53:48 +0000 (01:53 +0000)]
am
9a59d411: am
85e6e87c: Merge "Restore accidentally-removed NULL timeout."
* commit '
9a59d411cbe68d6027c541854c6d7c1348e4ee3d':
Restore accidentally-removed NULL timeout.
Elliott Hughes [Thu, 22 May 2014 01:49:44 +0000 (01:49 +0000)]
am
85e6e87c: Merge "Restore accidentally-removed NULL timeout."
* commit '
85e6e87c41bba51729cee8958a5c30157c8dc674':
Restore accidentally-removed NULL timeout.
Elliott Hughes [Thu, 22 May 2014 01:45:47 +0000 (01:45 +0000)]
Merge "Restore accidentally-removed NULL timeout."
Elliott Hughes [Thu, 22 May 2014 01:44:27 +0000 (18:44 -0700)]
Restore accidentally-removed NULL timeout.
Change-Id: I933c80fea50950243f109acf8d6350013aaa811f
Elliott Hughes [Thu, 22 May 2014 01:32:20 +0000 (01:32 +0000)]
am
ad71caf2: am
3b6da6bf: Merge "Move frameworks/av off private API."
* commit '
ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e':
Move frameworks/av off private API.
Elliott Hughes [Thu, 22 May 2014 01:28:18 +0000 (01:28 +0000)]
am
3b6da6bf: Merge "Move frameworks/av off private API."
* commit '
3b6da6bfb50a1c0324fb4c87326d3a477944d5fe':
Move frameworks/av off private API.
Elliott Hughes [Thu, 22 May 2014 01:23:41 +0000 (01:23 +0000)]
Merge "Move frameworks/av off private API."
Elliott Hughes [Thu, 22 May 2014 00:55:51 +0000 (17:55 -0700)]
Move frameworks/av off private API.
Bug:
11156955
Change-Id: Ib3bb9d66a2bf92977c2445b62aa074a2d7a45aea
Elliott Hughes [Thu, 22 May 2014 00:41:52 +0000 (00:41 +0000)]
am
acbd9492: am
d084206d: Merge "Move frameworks/av off __futex_syscall3."
* commit '
acbd9492996348bf4565fbaa5a14772f0f4ace38':
Move frameworks/av off __futex_syscall3.
Elliott Hughes [Thu, 22 May 2014 00:39:10 +0000 (00:39 +0000)]
am
d084206d: Merge "Move frameworks/av off __futex_syscall3."
* commit '
d084206d5a4a5364211af46e4201311933e83bfc':
Move frameworks/av off __futex_syscall3.
Elliott Hughes [Thu, 22 May 2014 00:35:48 +0000 (00:35 +0000)]
Merge "Move frameworks/av off __futex_syscall3."
Elliott Hughes [Thu, 22 May 2014 00:31:18 +0000 (17:31 -0700)]
Move frameworks/av off __futex_syscall3.
Bug:
11156955
Change-Id: I943080bc51b6efa781059b48b5b5ecc4fa287512
Eric Laurent [Mon, 19 May 2014 15:32:11 +0000 (15:32 +0000)]
am
4c9bde7a: am
ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode"
* commit '
4c9bde7a3e636d3ecccd7905d142dbbb80e977a0':
Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode
Eric Laurent [Mon, 19 May 2014 15:28:51 +0000 (15:28 +0000)]
am
ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL 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
Eric Laurent [Mon, 19 May 2014 15:26:37 +0000 (15:26 +0000)]
Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode"
Andreas Huber [Fri, 16 May 2014 15:18:01 +0000 (15:18 +0000)]
am
1b8b8793: am
3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning"
* commit '
1b8b8793c0e86865df456c3d26f969b1498041db':
libstagefright foundation: fix uninitialized varibale warning
Andreas Huber [Fri, 16 May 2014 15:14:38 +0000 (15:14 +0000)]
am
3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning"
* commit '
3059e27d0e18a427f3c19889aac86ea31ec0d5d1':
libstagefright foundation: fix uninitialized varibale warning
Andreas Huber [Fri, 16 May 2014 15:11:28 +0000 (15:11 +0000)]
Merge "libstagefright foundation: fix uninitialized varibale warning"
Amit Pundir [Thu, 15 May 2014 07:12:04 +0000 (12:42 +0530)]
libstagefright foundation: fix uninitialized varibale warning
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>
Benoit Goby [Wed, 14 May 2014 22:04:12 +0000 (22:04 +0000)]
am
e32106fd: screenrecord: Add raw frames output format
* commit '
e32106fd5175afdf939ae397aece9caf378a4912':
screenrecord: Add raw frames output format
Uday Gupta [Tue, 13 May 2014 18:19:17 +0000 (11:19 -0700)]
Codec Offload: Add NULL check as mCallbackThread is NULL
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>
Benoit Goby [Mon, 12 May 2014 22:59:50 +0000 (15:59 -0700)]
screenrecord: Add raw frames output format
This works like the frames output format but without a header so that
the output can be piped directly to mplayer:
adb shell screenrecord --output-format=raw-frames - | mplayer -demuxer
rawvideo -rawvideo w=320:h=240:format=rgb24 -
Change-Id: Ib5ed508fdca3a5d63e973c5189b3677c2d92b43f
Andy McFadden [Mon, 12 May 2014 23:18:30 +0000 (23:18 +0000)]
am
21bde57f: Add frame dump output
* commit '
21bde57f0099fed5cca78d9357571dc015a63227':
Add frame dump output
Andy McFadden [Mon, 12 May 2014 23:18:29 +0000 (23:18 +0000)]
am
2d11a203: Provide raw H.264 output from screenrecord
* commit '
2d11a2031b99db9b503a7ad7efd1f18606af4012':
Provide raw H.264 output from screenrecord
Andy McFadden [Wed, 26 Feb 2014 02:29:06 +0000 (18:29 -0800)]
Add frame dump output
This adds the ability to dump frames as RGB data with a minimal
frame header. Only recommended for devices with small displays.
Enable with "--output-format=frames".
The "--raw" option is now selected with "--output-format=h264".
Change-Id: I18d3d4a87cd056d7acf0658985a90dc5895dbfb6
Andy McFadden [Fri, 20 Dec 2013 21:40:34 +0000 (13:40 -0800)]
Provide raw H.264 output from screenrecord
This adds an experimental (undocumented) "--raw" flag. If set, we
output an H.264 byte stream rather than a .mp4 file.
If the filename is "-", we send the output to stdout. If stdout is a
tty, we reconfigure it to avoid CRLF line termination over adb.
Change-Id: I5193f6193c9c1a59f92eefad0ed399f24afbf6de
Eino-Ville Talvala [Mon, 12 May 2014 17:36:42 +0000 (17:36 +0000)]
am
c36fbcdf: am
f02f06c4: Merge "camera: check Intent entry count before reading it"
* commit '
c36fbcdf37ec02314e7b8134bb0de5f624fa70fd':
camera: check Intent entry count before reading it
Eino-Ville Talvala [Mon, 12 May 2014 17:31:29 +0000 (17:31 +0000)]
am
f02f06c4: Merge "camera: check Intent entry count before reading it"
* commit '
f02f06c422a58ddaca49d14f21a196eaa435d07b':
camera: check Intent entry count before reading it
Eino-Ville Talvala [Mon, 12 May 2014 17:27:54 +0000 (17:27 +0000)]
Merge "camera: check Intent entry count before reading it"
Yuvraj Pasi [Tue, 15 Apr 2014 13:33:26 +0000 (19:03 +0530)]
camera: check Intent entry count before reading it
In case when find() returns empty entry, blindly
reading the entry will cause segfault
Change-Id: Ib5be7fd855c409ba3b45f0d43e15237367172817
Ying Wang [Thu, 8 May 2014 08:55:36 +0000 (08:55 +0000)]
am
02483465: am
1d2909b3: Merge "Remove unused LOCAL_LDLIBS."
* commit '
02483465e294571a6a92fce4f38c933e77bf5e67':
Remove unused LOCAL_LDLIBS.
Ying Wang [Thu, 8 May 2014 07:27:53 +0000 (07:27 +0000)]
am
1d2909b3: Merge "Remove unused LOCAL_LDLIBS."
* commit '
1d2909b38f76d9d866e61cf505b88518d3a52acf':
Remove unused LOCAL_LDLIBS.
Ying Wang [Thu, 8 May 2014 07:25:00 +0000 (07:25 +0000)]
Merge "Remove unused LOCAL_LDLIBS."
Ying Wang [Thu, 8 May 2014 07:23:11 +0000 (00:23 -0700)]
Remove unused LOCAL_LDLIBS.
Change-Id: I14865bee99fbcc5188b64fbd22bb49a1947ec6ff
Eric Laurent [Tue, 6 May 2014 15:30:49 +0000 (15:30 +0000)]
am
f655acf1: am
8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_l()"
* commit '
f655acf15e587dbf5d7120e9f2bf4b5bcb89941c':
Fix memory leak when filtering commands in insertCommand_l()
Eric Laurent [Tue, 6 May 2014 15:28:39 +0000 (15:28 +0000)]
am
8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_l()"
* commit '
8fb04d474ed9e0d1302ae223ee76fafbe5fb41a3':
Fix memory leak when filtering commands in insertCommand_l()
Eric Laurent [Tue, 6 May 2014 15:25:45 +0000 (15:25 +0000)]
Merge "Fix memory leak when filtering commands in insertCommand_l()"
Lajos Molnar [Fri, 2 May 2014 18:04:22 +0000 (18:04 +0000)]
am
bc4bf532: am
b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"
* commit '
bc4bf532b7581ecb1c8734a63742183c3ecb02c5':
AwesomePlayer: use PTS for queueBuffer
Lajos Molnar [Fri, 2 May 2014 18:01:21 +0000 (18:01 +0000)]
am
b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"
* commit '
b231408849158baea8dddc0edf7e97fcfc2e3240':
AwesomePlayer: use PTS for queueBuffer
Lajos Molnar [Fri, 2 May 2014 18:00:44 +0000 (18:00 +0000)]
am
5fa3f7af: am
b52675e9: Merge "Smooth out AwesomePlayer"
* commit '
5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5':
Smooth out AwesomePlayer
Lajos Molnar [Fri, 2 May 2014 17:57:56 +0000 (17:57 +0000)]
am
b52675e9: Merge "Smooth out AwesomePlayer"
* commit '
b52675e9e3b2cfd7ca3ec4eda80dde77dee9dafb':
Smooth out AwesomePlayer
Lajos Molnar [Fri, 2 May 2014 17:56:37 +0000 (17:56 +0000)]
Merge "AwesomePlayer: use PTS for queueBuffer"