summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-2937-609/+2705
|\
| * am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/r...Igor Murashkin2014-03-255-44/+706
| |\
| | * DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-255-44/+706
| * | am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
| |\ \
| * \ \ resolved conflicts for merge of 3d7c5002 to klp-dev-plus-aospColin Cross2014-03-2120-70/+80
| |\ \ \
| * \ \ \ am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when par...Lajos Molnar2014-03-211-0/+12
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." i...Lajos Molnar2014-03-211-0/+12
| | |\ \ \
| | | * | | DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.Robert Shih2014-03-211-0/+12
| * | | | | am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32...Rachad2014-03-211-3/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Increased recorded MP4 max file size to 4GBRachad2014-03-211-3/+5
| | |/ / /
| * | | | am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806:...Marco Nelissen2014-03-201-0/+1
| |\ \ \ \ | | |/ / /
| | * | | am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628:...Marco Nelissen2014-03-201-0/+1
| | |\ \ \
| | | * \ \ am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830:...Marco Nelissen2014-03-201-0/+1
| | | |\ \ \
| | | | * \ \ am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | |\ \ \
| | | | | * \ \ am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | | |\ \ \
| | | | | | * \ \ am 42ba5806: am 72499628: am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | | | |\ \ \
| | | | | | | * \ \ am 72499628: am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | | | | |\ \ \
| | | | | | | | * \ \ am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | | | | | |\ \ \
| | | | | | | | | * | | Fix buildMarco Nelissen2014-03-201-0/+1
| * | | | | | | | | | | am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba:...Marco Nelissen2014-03-201-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80:...Marco Nelissen2014-03-201-1/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b:...Marco Nelissen2014-03-201-2/+102
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea:...Marco Nelissen2014-03-201-2/+102
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75:...Marco Nelissen2014-03-201-2/+102
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | * | | | | | am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certi...Marco Nelissen2014-03-201-2/+102
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / /
| | | | | | | * | | | | am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / /
| | | | | | | | * | | | am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | | | | |\ \ \ \ | | | | | | | | | |/ / /
| | | | | | | | | * | | am 3bc4f7ea: am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | | | | | | |\ \ \
| | | | | | | | | | | * | | Verify certificatesMarco Nelissen2014-03-191-2/+102
| * | | | | | | | | | | | | am 24e1bd71: Merge "libstagefright is no longer 32 bit only."Glenn Kasten2014-03-197-13/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am bd7bde79: Merge "Use libaudioresampler instead of libaudioflinger"Glenn Kasten2014-03-194-11/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 36817364: Merge "Add libaudioresampler"Glenn Kasten2014-03-191-11/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1faa4170: stagefright: allow for minUndequeuedBufs to be one lessLajos Molnar2014-03-192-7/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | stagefright: allow for minUndequeuedBufs to be one lessLajos Molnar2014-03-192-7/+10
| * | | | | | | | | | | | | | | | am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-193-30/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-193-30/+56
| * | | | | | | | | | | | | | | | am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.Robert Shih2014-03-195-188/+285
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | httplive: block-by-block fetch, decrypt, and parse ts files.Robert Shih2014-03-195-188/+285
| * | | | | | | | | | | | | | | | am b2ecad7f: Merge "libstagefright_foundation: fix printf format for 64-bit"Colin Cross2014-03-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 77658a06: Merge "AudioPolicyService: malloc/delete pair"Glenn Kasten2014-03-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories"Glenn Kasten2014-03-185-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bd3e2e03: camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| * | | | | | | | | | | | | | | | | | | am 0e7e5db7: Merge "More 32-bit only"Glenn Kasten2014-03-171-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 75dcf510: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-1/+101
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-1/+101
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Verify certificatesMarco Nelissen2014-03-132-1/+101
| * | | | | | | | | | | | | | | | | | | | | am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-1414-0/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"Andreas Huber2014-03-141-11/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \