Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | * | | | | | | | Temporary workaround for log spam | Glenn Kasten | 2014-05-01 | 1 | -0/+5 | |
| | | | |/ / / / / / | ||||||
* | | | | | | | | | | am 3c782246: am b1d2b51c: am 761636f3: Merge "Do not force all command-line a... | Glenn Kasten | 2014-04-30 | 2 | -18/+0 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | / / / / | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | am b1d2b51c: am 761636f3: Merge "Do not force all command-line apps to be 32-... | Glenn Kasten | 2014-04-30 | 2 | -18/+0 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | am 761636f3: Merge "Do not force all command-line apps to be 32-bit only" | Glenn Kasten | 2014-04-30 | 2 | -18/+0 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | ||||||
| | | * | | | | | | Merge "Do not force all command-line apps to be 32-bit only" | Glenn Kasten | 2014-04-30 | 2 | -18/+0 | |
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | ||||||
| | | | * | | | | | Do not force all command-line apps to be 32-bit only | Glenn Kasten | 2014-04-30 | 2 | -18/+0 | |
| | | |/ / / / / | ||||||
* | | | | | | | | resolved conflicts for merge of 0d79b935 to master | Glenn Kasten | 2014-04-30 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am b27ce2fb: am 416685d0: Merge "Fix format warnings" | Glenn Kasten | 2014-04-30 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | am 416685d0: Merge "Fix format warnings" | Glenn Kasten | 2014-04-30 | 1 | -3/+3 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | | * | | | | | Merge "Fix format warnings" | Glenn Kasten | 2014-04-30 | 1 | -3/+3 | |
| | | |\ \ \ \ \ | ||||||
| | | | * | | | | | Fix format warnings | Glenn Kasten | 2014-04-28 | 1 | -3/+3 | |
* | | | | | | | | | Define CHANNEL_MASK_* in terms of AUDIO_CHANNEL_OUT_* | Glenn Kasten | 2014-04-30 | 1 | -18/+7 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
* | | | | | | | | Remove AUDIO_CHANNEL_OUT_SURROUND | Glenn Kasten | 2014-04-30 | 2 | -64/+0 | |
* | | | | | | | | am f612af07: am 1a7be1ec: Merge commit \'91820d46b5f3065c2fded3cdf65d305715b3... | Bill Yi | 2014-04-30 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am 1a7be1ec: Merge commit \'91820d46b5f3065c2fded3cdf65d305715b33bb1\' into HEAD | Bill Yi | 2014-04-30 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | 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 | |
| | | |\ \ \ \ \ | ||||||
| | | * \ \ \ \ \ | 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 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ | am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32... | 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 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba:... | Marco Nelissen | 2014-03-20 | 1 | -1/+2 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ | 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 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am b635b0e6: 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 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | 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 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | 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 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | 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 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev | Lajos Molnar | 2014-03-14 | 2 | -1/+2 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 67a10c52: Merge "httplive: clear access units before returning from seekTo... | Lajos Molnar | 2014-03-14 | 4 | -15/+42 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am cf49a51f: fix codec buffer leak in error handling when timestamp goes back... | Chong Zhang | 2014-03-14 | 1 | -7/+7 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" i... | Chong Zhang | 2014-03-13 | 6 | -6/+169 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspended | Chong Zhang | 2014-03-13 | 1 | -0/+6 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 19afb386: Merge "Remove streaming URI from default logs" | Marco Nelissen | 2014-03-13 | 5 | -6/+5 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch" | Narayan Kamath | 2014-03-11 | 2 | -4/+7 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a9b82160: Merge "LP64 fixes for media/libeffects" | Narayan Kamath | 2014-03-11 | 14 | -61/+62 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 395c2fc0: Merge "audioflinger: Fix for a deadlock in track creation" | Glenn Kasten | 2014-03-11 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 525b099a: Merge "Fix ALOGVs for 64bit" | Narayan Kamath | 2014-03-11 | 2 | -4/+4 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 0cf16339: Merge "Fix preventing from heap overwrite in capture command" | Glenn Kasten | 2014-03-11 | 1 | -34/+35 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 096d72a3: Merge "AArch64: Correction for LP64" | Narayan Kamath | 2014-03-11 | 1 | -5/+5 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 5969b408: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH" | Ying Wang | 2014-03-11 | 1 | -1/+2 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |