Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | am eced745a: Merge "Part of fix for TEE resource leaks when app crashes" into... | Jeff Tinker | 2013-07-07 | 2 | -1/+19 | |
|\ | ||||||
| * | Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-dev | Jeff Tinker | 2013-07-07 | 2 | -1/+19 | |
| |\ | ||||||
| | * | Part of fix for TEE resource leaks when app crashes | Jeff Tinker | 2013-07-03 | 2 | -1/+19 | |
* | | | am f59a4b39: fix scheduling policy service death detection | Eric Laurent | 2013-07-03 | 2 | -13/+31 | |
|\ \ \ | |/ / | ||||||
| * | | fix scheduling policy service death detection | Eric Laurent | 2013-07-02 | 2 | -13/+31 | |
| |/ | ||||||
| | | ||||||
| \ | ||||||
*-. \ | Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-07-01 | 0 | -0/+0 | |
|\ \ \ | ||||||
| | * \ | merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev | The Android Automerger | 2013-06-30 | 0 | -0/+0 | |
| | |\ \ | | | |/ | | |/| | ||||||
| * | | | Update HTTP proxy configuration for all media playback inside stagefright. | Andreas Huber | 2013-06-28 | 16 | -2/+172 | |
* | | | | am 47a1fe04: am a9aa6baa: Merge "Set u.ext_data to null after it has been freed" | Andreas Huber | 2013-06-28 | 1 | -0/+1 | |
|\ \ \ \ | ||||||
| * \ \ \ | am a9aa6baa: Merge "Set u.ext_data to null after it has been freed" | Andreas Huber | 2013-06-28 | 1 | -0/+1 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge "Set u.ext_data to null after it has been freed" | Andreas Huber | 2013-06-28 | 1 | -0/+1 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Set u.ext_data to null after it has been freed | Christer Fletcher | 2013-06-28 | 1 | -0/+1 | |
* | | | | | | | am 83790fcc: am bdf33c98: Merge "Fix compilation warning: incorrect format sp... | Glenn Kasten | 2013-06-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am bdf33c98: Merge "Fix compilation warning: incorrect format specifier for t... | Glenn Kasten | 2013-06-28 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Merge "Fix compilation warning: incorrect format specifier for type 'ssize_t'." | Glenn Kasten | 2013-06-28 | 1 | -1/+1 | |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | | * | | | | Fix compilation warning: incorrect format specifier for type 'ssize_t'. | Scott Fan | 2013-06-27 | 1 | -1/+1 | |
| | |/ / / / | ||||||
* | | | | | | am a691ff3c: Camera2/3: Don\'t allow recording and callbacks to coexist. | Eino-Ville Talvala | 2013-06-28 | 2 | -29/+85 | |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
| * | | | | | Camera2/3: Don't allow recording and callbacks to coexist. | Eino-Ville Talvala | 2013-06-27 | 2 | -29/+85 | |
* | | | | | | Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-06-25 | 0 | -0/+0 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev | The Android Automerger | 2013-06-24 | 0 | -0/+0 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD | The Android Automerger | 2013-06-24 | 0 | -0/+0 | |
| | |\ \ \ \ | ||||||
* | | \ \ \ \ | am 3a4ff0b8: am d74a9ee8: Merge "libstagefright: fix the duration "00:00" for... | Jean-Baptiste Queru | 2013-06-25 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | am d74a9ee8: Merge "libstagefright: fix the duration "00:00" for some httpliv... | Jean-Baptiste Queru | 2013-06-25 | 0 | -0/+0 | |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | ||||||
| | * | | | | | Merge "libstagefright: fix the duration "00:00" for some httplive link" | Jean-Baptiste Queru | 2013-06-25 | 1 | -3/+0 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | libstagefright: fix the duration "00:00" for some httplive link | ywan171 | 2012-08-24 | 1 | -3/+0 | |
* | | | | | | | | Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-06-21 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | ||||||
| * | | | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev | The Android Automerger | 2013-06-21 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | | ||||||
* | | | | | | | am 209bbbcf: Apply EQ and bass boost first in effect chain | Jean-Michel Trivi | 2013-06-20 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Apply EQ and bass boost first in effect chain | Jean-Michel Trivi | 2013-06-20 | 1 | -2/+2 | |
* | | | | | | | am f3e21c30: am 60f3f102: Merge "Prevent AudioCommands being freed before read" | Glenn Kasten | 2013-06-20 | 1 | -6/+8 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | am 60f3f102: Merge "Prevent AudioCommands being freed before read" | Glenn Kasten | 2013-06-20 | 1 | -6/+8 | |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | ||||||
| | * | | | | | Merge "Prevent AudioCommands being freed before read" | Glenn Kasten | 2013-06-20 | 1 | -6/+8 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Prevent AudioCommands being freed before read | Christer Fletcher | 2013-06-20 | 1 | -6/+8 | |
* | | | | | | | | am e6478de7: Camera2/3: Avoid shutdown race in callback processor. | Eino-Ville Talvala | 2013-06-19 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | ||||||
| * | | | | | | | Camera2/3: Avoid shutdown race in callback processor. | Eino-Ville Talvala | 2013-06-19 | 1 | -1/+4 | |
* | | | | | | | | 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 | |
* | | | | | | | | 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 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 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 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 | |
* | | | | | | | | 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 |