Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mv libcpustats from frameworks/native to frameworks/av | Glenn Kasten | 2013-06-18 | 6 | -0/+568 |
* | am bda5d1f2: am 241b5279: Camera3: Power: Properly shut down unused thread. | Eino-Ville Talvala | 2013-06-17 | 1 | -2/+3 |
|\ | |||||
| * | am 241b5279: Camera3: Power: Properly shut down unused thread. | Eino-Ville Talvala | 2013-06-17 | 1 | -2/+3 |
| |\ | |||||
| | * | Camera3: Power: Properly shut down unused thread. | Eino-Ville Talvala | 2013-06-17 | 1 | -2/+3 |
* | | | Merge "Speed up id3v2 unsynchronization" | Marco Nelissen | 2013-06-17 | 1 | -5/+10 |
|\ \ \ | |||||
| * | | | Speed up id3v2 unsynchronization | Marco Nelissen | 2013-06-17 | 1 | -5/+10 |
* | | | | Merge "The software avc decoder would silently drop output frames if not" | Andreas Huber | 2013-06-17 | 2 | -36/+31 |
|\ \ \ \ | |||||
| * | | | | The software avc decoder would silently drop output frames if not | Andreas Huber | 2013-06-14 | 2 | -36/+31 |
| |/ / / | |||||
* | | | | am 05e87d53: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-06-16 | 0 | -0/+0 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-06-16 | 0 | -0/+0 |
| |\ \ \ | |||||
| | * \ \ | merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev | The Android Automerger | 2013-06-16 | 0 | -0/+0 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
* | | | | | am 0cc75491: am 26bc908b: Camera2/3: Make sure to wait for idle after still c... | Eino-Ville Talvala | 2013-06-14 | 1 | -0/+6 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 26bc908b: Camera2/3: Make sure to wait for idle after still capture. | Eino-Ville Talvala | 2013-06-14 | 1 | -0/+6 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Camera2/3: Make sure to wait for idle after still capture. | Eino-Ville Talvala | 2013-06-13 | 1 | -0/+6 |
* | | | | | am e4a453d4: am 214a17fd: Camera3: Always close HAL device even in face of er... | Eino-Ville Talvala | 2013-06-14 | 1 | -10/+20 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 214a17fd: Camera3: Always close HAL device even in face of errors. | Eino-Ville Talvala | 2013-06-14 | 1 | -10/+20 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Camera3: Always close HAL device even in face of errors. | Eino-Ville Talvala | 2013-06-13 | 1 | -10/+20 |
* | | | | | am 767227fc: am 82fc2ca6: am d5018116: Merge "Fix typo." | Glenn Kasten | 2013-06-14 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 82fc2ca6: am d5018116: Merge "Fix typo." | Glenn Kasten | 2013-06-14 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * \ \ \ | am d5018116: Merge "Fix typo." | Glenn Kasten | 2013-06-14 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge "Fix typo." | Glenn Kasten | 2013-06-14 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Fix typo. | Masaki Muranaka | 2013-06-06 | 1 | -1/+1 |
* | | | | | | | | Merge "AudioRecord must be used as sp<> only" | Glenn Kasten | 2013-06-14 | 3 | -9/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | AudioRecord must be used as sp<> only | Glenn Kasten | 2013-06-13 | 3 | -9/+6 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge "camera2: accept 4-value active array size" | Alex Ray | 2013-06-13 | 1 | -3/+10 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | camera2: accept 4-value active array size | Alex Ray | 2013-06-13 | 1 | -3/+10 |
* | | | | | | | | am ccc366a9: am 1191454a: Merge "Camera3: Skipping no-ops good, not updating ... | Eino-Ville Talvala | 2013-06-13 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | am 1191454a: Merge "Camera3: Skipping no-ops good, not updating state machine... | Eino-Ville Talvala | 2013-06-13 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | Merge "Camera3: Skipping no-ops good, not updating state machine bad." into j... | Eino-Ville Talvala | 2013-06-13 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Camera3: Skipping no-ops good, not updating state machine bad. | Eino-Ville Talvala | 2013-06-12 | 1 | -0/+1 |
* | | | | | | | | | am 4541531a: am c4a8d2dd: Merge "Camera2/3: Create JPEG stream unconditionall... | Eino-Ville Talvala | 2013-06-13 | 1 | -12/+16 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am c4a8d2dd: Merge "Camera2/3: Create JPEG stream unconditionally." into jb-m... | Eino-Ville Talvala | 2013-06-13 | 1 | -12/+16 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge "Camera2/3: Create JPEG stream unconditionally." into jb-mr2-dev | Eino-Ville Talvala | 2013-06-13 | 1 | -12/+16 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | | * | | | | | | Camera2/3: Create JPEG stream unconditionally. | Eino-Ville Talvala | 2013-06-11 | 1 | -12/+16 |
* | | | | | | | | | am a4539807: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-06-13 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-06-13 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev | The Android Automerger | 2013-06-13 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
* | | | | | | | | | am a1d73d9b: (-s ours) Reconcile with jb-mr2-release - do not merge | The Android Open Source Project | 2013-06-12 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Reconcile with jb-mr2-release - do not merge | The Android Open Source Project | 2013-06-12 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | audioflinger: fix effects on direct output threads | Eric Laurent | 2013-06-12 | 1 | -7/+5 |
* | | | | | | | | | | New control block for AudioTrack and AudioRecord | Glenn Kasten | 2013-06-12 | 14 | -1550/+2496 |
* | | | | | | | | | | Converter now takes the desired _output_ format instead of the | Andreas Huber | 2013-06-12 | 3 | -37/+30 |
* | | | | | | | | | | am f8af99b7: am 0662f7b6: Merge "stagefright: synchronously change nativewind... | Lajos Molnar | 2013-06-12 | 2 | -14/+19 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 0662f7b6: Merge "stagefright: synchronously change nativewindow crop" into... | Lajos Molnar | 2013-06-12 | 2 | -14/+19 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge "stagefright: synchronously change nativewindow crop" into jb-mr2-dev | Lajos Molnar | 2013-06-12 | 2 | -14/+19 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | stagefright: synchronously change nativewindow crop | Lajos Molnar | 2013-06-11 | 2 | -14/+19 |
* | | | | | | | | | | | am bb35be24: am 7be48189: Merge "audioflinger: fix effects on direct output t... | Eric Laurent | 2013-06-12 | 1 | -7/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am 7be48189: Merge "audioflinger: fix effects on direct output threads" into ... | Eric Laurent | 2013-06-12 | 1 | -7/+5 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge "audioflinger: fix effects on direct output threads" into jb-mr2-dev | Eric Laurent | 2013-06-12 | 1 | -7/+5 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | audioflinger: fix effects on direct output threads | Eric Laurent | 2013-06-11 | 1 | -7/+5 |
| | | | |_|/ / / / / | | | |/| | | | | | |