summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix uses of KeyedVector"Glenn Kasten2014-03-263-3/+2
|\
| * Fix uses of KeyedVectorGlenn Kasten2014-03-253-3/+2
* | Merge "Remove streamType parameter from AudioSystem::getLatency()"Glenn Kasten2014-03-263-5/+3
|\ \
| * | Remove streamType parameter from AudioSystem::getLatency()Glenn Kasten2014-03-253-5/+3
| |/
* | Merge "Remove dead code"Glenn Kasten2014-03-261-20/+0
|\ \
| * | Remove dead codeGlenn Kasten2014-03-261-20/+0
| |/
* | Merge "Fix log spam when MonoPipe is unable to get local frequency"Glenn Kasten2014-03-261-6/+22
|\ \
| * | Fix log spam when MonoPipe is unable to get local frequencyGlenn Kasten2014-03-251-6/+22
| |/
* | Merge "Revert "camera: Fix setParameters for Preview FPS single/range values""Eino-Ville Talvala2014-03-263-267/+47
|\ \
| * | Revert "camera: Fix setParameters for Preview FPS single/range values"Eino-Ville Talvala2014-03-263-267/+47
* | | Merge "Document AudioSystem::newAudioSessionId() failures"Glenn Kasten2014-03-263-2/+8
|\ \ \ | |/ / |/| |
| * | Document AudioSystem::newAudioSessionId() failuresGlenn Kasten2014-03-253-2/+8
| |/
* | Merge "Document AudioFlinger::nextUniqueId()"Glenn Kasten2014-03-262-2/+13
|\ \
| * | Document AudioFlinger::nextUniqueId()Glenn Kasten2014-03-252-2/+13
| |/
* | am c3dcf100: (-s ours) am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix se...Igor Murashkin2014-03-250-0/+0
|\ \
| * \ am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview...Igor Murashkin2014-03-255-44/+706
| |\ \
| | * \ 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 a1aaaf86: am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
| |\ \ \
| | * \ \ Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
| | |\ \ \
| | | * | | CameraService: deadlock fixKalle Lampila2014-03-251-0/+1
| | |/ / /
* | | | | Fix operator precedenceGlenn Kasten2014-03-251-2/+2
* | | | | Merge "mtp: avoid silent allocation overflow in MtpProperty"Lajos Molnar2014-03-251-1/+8
|\ \ \ \ \
| * | | | | mtp: avoid silent allocation overflow in MtpPropertyLajos Molnar2014-03-241-1/+8
* | | | | | Merge "Camera3: Fix flush call deadlock"Zhijun He2014-03-252-1/+12
|\ \ \ \ \ \
| * | | | | | Camera3: Fix flush call deadlockZhijun He2014-03-232-1/+12
* | | | | | | am 5c679d41: resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus...Colin Cross2014-03-2420-70/+80
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aospColin Cross2014-03-2120-70/+80
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge changes I9f28bc42,I135620e0Colin Cross2014-03-2220-70/+80
| | |\ \ \ \ \
| | | * | | | | libcameraservice: build 64-bitColin Cross2014-03-211-1/+0
| | | * | | | | libcameraservice: fix 64-bit print format warningsColin Cross2014-03-2119-69/+80
| | |/ / / / /
* | | | | | | am ba139033: (-s ours) am 30890210: am 333ceb4f: Merge "DO NOT MERGE: Playlis...Lajos Molnar2014-03-240-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | am 30890210: am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite ...Lajos Molnar2014-03-211-0/+12
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | 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 d1afbf13: am 1bfb8f76: am f622e2c7: Increased recorded MP4 max file size t...Rachad2014-03-220-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 1bfb8f76: am f622e2c7: Increased recorded MP4 max file size to 4GB (more p...Rachad2014-03-211-3/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 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
| | | |/ / /
* | | | | | Merge "CameraService: Add support for burst capture and repeating burst."Jianing Wei2014-03-227-3/+259
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | CameraService: Add support for burst capture and repeating burst.Jianing Wei2014-03-217-3/+259
* | | | | | Merge "stagefright: initial media_codecs_google*.xml files"Lajos Molnar2014-03-213-0/+88
|\ \ \ \ \ \
| * | | | | | stagefright: initial media_codecs_google*.xml filesLajos Molnar2014-03-193-0/+88
* | | | | | | Merge "audio policy: add option to use new policy manager"Eric Laurent2014-03-219-218/+1000
|\ \ \ \ \ \ \
| * | | | | | | audio policy: add option to use new policy managerEric Laurent2014-03-189-218/+1000
* | | | | | | | am 84f7a5b2: (-s ours) am 9ec86fa0: am a577eefb: am 5be9c1da: am 01eed3c0: am...Marco Nelissen2014-03-200-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | am 9ec86fa0: am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061:...Marco Nelissen2014-03-201-0/+1
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806:...Marco Nelissen2014-03-201-0/+1
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
generated by cgit v1.1 at 2024-06-29 12:22:45 +0000