Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEAD | Bill Yi | 2014-04-29 | 37 | -609/+2705 |
|\ | |||||
| * | am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/r... | Igor Murashkin | 2014-03-25 | 5 | -44/+706 |
| |\ | |||||
| | * | DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values | Igor Murashkin | 2014-03-25 | 5 | -44/+706 |
| * | | am 4f53fe74: Merge "CameraService: deadlock fix" | Eino-Ville Talvala | 2014-03-25 | 1 | -0/+1 |
| |\ \ | |||||
| * \ \ | resolved conflicts for merge of 3d7c5002 to klp-dev-plus-aosp | Colin Cross | 2014-03-21 | 20 | -70/+80 |
| |\ \ \ | |||||
| * \ \ \ | am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when par... | Lajos Molnar | 2014-03-21 | 1 | -0/+12 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." i... | Lajos Molnar | 2014-03-21 | 1 | -0/+12 |
| | |\ \ \ | |||||
| | | * | | | DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS. | Robert Shih | 2014-03-21 | 1 | -0/+12 |
| * | | | | | am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32... | Rachad | 2014-03-21 | 1 | -3/+5 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Increased recorded MP4 max file size to 4GB | Rachad | 2014-03-21 | 1 | -3/+5 |
| | |/ / / | |||||
| * | | | | am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806:... | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628:... | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | | * \ \ | am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830:... | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | | |\ \ \ | |||||
| | | | * \ \ | am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | | | |\ \ \ | |||||
| | | | | * \ \ | am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | | | | |\ \ \ | |||||
| | | | | | * \ \ | am 42ba5806: am 72499628: am 25bab830: Fix build | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | | | | | |\ \ \ | |||||
| | | | | | | * \ \ | am 72499628: am 25bab830: Fix build | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | | | | | | |\ \ \ | |||||
| | | | | | | | * \ \ | am 25bab830: Fix build | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| | | | | | | | |\ \ \ | |||||
| | | | | | | | | * | | | Fix build | Marco Nelissen | 2014-03-20 | 1 | -0/+1 |
| * | | | | | | | | | | | am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba:... | Marco Nelissen | 2014-03-20 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80:... | Marco Nelissen | 2014-03-20 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b:... | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | |||||
| | | | * | | | | | | | | am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea:... | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | |||||
| | | | | * | | | | | | | am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75:... | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | |||||
| | | | | | * | | | | | | am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certi... | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | |||||
| | | | | | | * | | | | | am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / / | |||||
| | | | | | | | * | | | | am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | | | | | |\ \ \ \ | | | | | | | | | |/ / / | |||||
| | | | | | | | | * | | | am 3bc4f7ea: am 0c271b75: Verify certificates | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | * \ \ | am 0c271b75: Verify certificates | Marco Nelissen | 2014-03-20 | 1 | -2/+102 |
| | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | * | | | Verify certificates | Marco Nelissen | 2014-03-19 | 1 | -2/+102 |
| * | | | | | | | | | | | | | am 24e1bd71: Merge "libstagefright is no longer 32 bit only." | Glenn Kasten | 2014-03-19 | 7 | -13/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | am bd7bde79: Merge "Use libaudioresampler instead of libaudioflinger" | Glenn Kasten | 2014-03-19 | 4 | -11/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 36817364: Merge "Add libaudioresampler" | Glenn Kasten | 2014-03-19 | 1 | -11/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less | Lajos Molnar | 2014-03-19 | 2 | -7/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | stagefright: allow for minUndequeuedBufs to be one less | Lajos Molnar | 2014-03-19 | 2 | -7/+10 |
| * | | | | | | | | | | | | | | | | am b635b0e6: mediaplayer: keep more buffers with the BufferQueue | Lajos Molnar | 2014-03-19 | 3 | -30/+56 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | mediaplayer: keep more buffers with the BufferQueue | Lajos Molnar | 2014-03-19 | 3 | -30/+56 |
| * | | | | | | | | | | | | | | | | am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files. | Robert Shih | 2014-03-19 | 5 | -188/+285 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | httplive: block-by-block fetch, decrypt, and parse ts files. | Robert Shih | 2014-03-19 | 5 | -188/+285 |
| * | | | | | | | | | | | | | | | | am b2ecad7f: Merge "libstagefright_foundation: fix printf format for 64-bit" | Colin Cross | 2014-03-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 77658a06: Merge "AudioPolicyService: malloc/delete pair" | Glenn Kasten | 2014-03-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories" | Glenn Kasten | 2014-03-18 | 5 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am bd3e2e03: camera2: Fix segfault when using null availability listener | Igor Murashkin | 2014-03-17 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | camera2: Fix segfault when using null availability listener | Igor Murashkin | 2014-03-17 | 1 | -0/+10 |
| * | | | | | | | | | | | | | | | | | | | am 0e7e5db7: Merge "More 32-bit only" | Glenn Kasten | 2014-03-17 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 75dcf510: Merge "Verify certificates" into klp-dev | Marco Nelissen | 2014-03-14 | 2 | -1/+101 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Merge "Verify certificates" into klp-dev | Marco Nelissen | 2014-03-14 | 2 | -1/+101 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | | Verify certificates | Marco Nelissen | 2014-03-13 | 2 | -1/+101 |
| * | | | | | | | | | | | | | | | | | | | | | am 089affb6: Merge "mediaserver and associated services are 32-bit only" | Glenn Kasten | 2014-03-14 | 14 | -0/+38 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect" | Andreas Huber | 2014-03-14 | 1 | -11/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |