Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge "Remove dead code" | Glenn Kasten | 2014-03-26 | 1 | -20/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove dead code | Glenn Kasten | 2014-03-26 | 1 | -20/+0 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge "Fix log spam when MonoPipe is unable to get local frequency" | Glenn Kasten | 2014-03-26 | 1 | -6/+22 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix log spam when MonoPipe is unable to get local frequency | Glenn Kasten | 2014-03-25 | 1 | -6/+22 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge "Revert "camera: Fix setParameters for Preview FPS single/range values"" | Eino-Ville Talvala | 2014-03-26 | 3 | -267/+47 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Revert "camera: Fix setParameters for Preview FPS single/range values" | Eino-Ville Talvala | 2014-03-26 | 3 | -267/+47 | |
* | | | | | | | | | Merge "Document AudioSystem::newAudioSessionId() failures" | Glenn Kasten | 2014-03-26 | 3 | -2/+8 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Document AudioSystem::newAudioSessionId() failures | Glenn Kasten | 2014-03-25 | 3 | -2/+8 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge "Document AudioFlinger::nextUniqueId()" | Glenn Kasten | 2014-03-26 | 2 | -2/+13 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Document AudioFlinger::nextUniqueId() | Glenn Kasten | 2014-03-25 | 2 | -2/+13 | |
| |/ / / / / / | ||||||
* | | | | | | | am c3dcf100: (-s ours) am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix se... | Igor Murashkin | 2014-03-25 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview... | Igor Murashkin | 2014-03-25 | 5 | -44/+706 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | * | | | | | 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 a1aaaf86: am 4f53fe74: Merge "CameraService: deadlock fix" | Eino-Ville Talvala | 2014-03-25 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | am 4f53fe74: Merge "CameraService: deadlock fix" | Eino-Ville Talvala | 2014-03-25 | 1 | -0/+1 | |
| |\ \ \ \ \ | ||||||
| | * \ \ \ \ | Merge "CameraService: deadlock fix" | Eino-Ville Talvala | 2014-03-25 | 1 | -0/+1 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | CameraService: deadlock fix | Kalle Lampila | 2014-03-25 | 1 | -0/+1 | |
| | |/ / / / / | ||||||
* | | | | | | | Fix operator precedence | Glenn Kasten | 2014-03-25 | 1 | -2/+2 | |
* | | | | | | | Merge "mtp: avoid silent allocation overflow in MtpProperty" | Lajos Molnar | 2014-03-25 | 1 | -1/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | mtp: avoid silent allocation overflow in MtpProperty | Lajos Molnar | 2014-03-24 | 1 | -1/+8 | |
* | | | | | | | | Merge "Camera3: Fix flush call deadlock" | Zhijun He | 2014-03-25 | 2 | -1/+12 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Camera3: Fix flush call deadlock | Zhijun He | 2014-03-23 | 2 | -1/+12 | |
* | | | | | | | | | am 5c679d41: resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus... | Colin Cross | 2014-03-24 | 20 | -70/+80 | |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aosp | Colin Cross | 2014-03-21 | 20 | -70/+80 | |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | Merge changes I9f28bc42,I135620e0 | Colin Cross | 2014-03-22 | 20 | -70/+80 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | libcameraservice: build 64-bit | Colin Cross | 2014-03-21 | 1 | -1/+0 | |
| | | * | | | | | | | libcameraservice: fix 64-bit print format warnings | Colin Cross | 2014-03-21 | 19 | -69/+80 | |
| | |/ / / / / / / | ||||||
* | | | | | | | | | am ba139033: (-s ours) am 30890210: am 333ceb4f: Merge "DO NOT MERGE: Playlis... | Lajos Molnar | 2014-03-24 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | / / / / / / | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | am 30890210: am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite ... | Lajos Molnar | 2014-03-21 | 1 | -0/+12 | |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | * | | | | | | 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 d1afbf13: am 1bfb8f76: am f622e2c7: Increased recorded MP4 max file size t... | Rachad | 2014-03-22 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am 1bfb8f76: am f622e2c7: Increased recorded MP4 max file size to 4GB (more p... | Rachad | 2014-03-21 | 1 | -3/+5 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | 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 | |
| | | |/ / / / | ||||||
* | | | | | | | Merge "CameraService: Add support for burst capture and repeating burst." | Jianing Wei | 2014-03-22 | 7 | -3/+259 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | CameraService: Add support for burst capture and repeating burst. | Jianing Wei | 2014-03-21 | 7 | -3/+259 | |
* | | | | | | | Merge "stagefright: initial media_codecs_google*.xml files" | Lajos Molnar | 2014-03-21 | 3 | -0/+88 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | stagefright: initial media_codecs_google*.xml files | Lajos Molnar | 2014-03-19 | 3 | -0/+88 | |
* | | | | | | | | Merge "audio policy: add option to use new policy manager" | Eric Laurent | 2014-03-21 | 9 | -218/+1000 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | audio policy: add option to use new policy manager | Eric Laurent | 2014-03-18 | 9 | -218/+1000 | |
* | | | | | | | | | am 84f7a5b2: (-s ours) am 9ec86fa0: am a577eefb: am 5be9c1da: am 01eed3c0: am... | Marco Nelissen | 2014-03-20 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | am 9ec86fa0: am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061:... | Marco Nelissen | 2014-03-20 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | ||||||
| | * | | | | | | | 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 | |
| | | | | | |\ \ \ \ \ \ |