Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | am 046d9c8d: am 06197925: am 267363ee: Merge "Prevent Media Server crash whil... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 | |
|\ | ||||||
| * | am 06197925: am 267363ee: Merge "Prevent Media Server crash while the Awesome... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 | |
| |\ | ||||||
| | * | am 267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBit... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 | |
| | |\ | ||||||
| | | * | Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return t... | Jean-Baptiste Queru | 2013-07-08 | 1 | -1/+1 | |
| | | |\ | ||||||
| | | | * | Prevent Media Server crash while the AwesomePlayer getBitrate return true wit... | hovanchen | 2013-07-03 | 1 | -1/+1 | |
* | | | | | am 9f0e0597: am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in R... | Jean-Baptiste Queru | 2013-07-08 | 1 | -0/+4 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in RTSPSource" | Jean-Baptiste Queru | 2013-07-08 | 1 | -0/+4 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | am ca7f1609: Merge "Prevent double disconnects in RTSPSource" | Jean-Baptiste Queru | 2013-07-08 | 1 | -0/+4 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | Merge "Prevent double disconnects in RTSPSource" | Jean-Baptiste Queru | 2013-07-08 | 1 | -0/+4 | |
| | | |\ \ | | | | |/ | | | |/| | ||||||
| | | | * | Prevent double disconnects in RTSPSource | Fredrik Rosin | 2013-07-01 | 1 | -0/+4 | |
| | | |/ | ||||||
* | | | | Merge "Explicitly compare raw pointers to NULL" | Glenn Kasten | 2013-07-08 | 1 | -18/+20 | |
|\ \ \ \ | ||||||
| * | | | | Explicitly compare raw pointers to NULL | Glenn Kasten | 2013-07-02 | 1 | -18/+20 | |
* | | | | | Merge "mv libcpustats from frameworks/native to frameworks/av" | Glenn Kasten | 2013-07-08 | 6 | -0/+568 | |
|\ \ \ \ \ | ||||||
| * | | | | | mv libcpustats from frameworks/native to frameworks/av | Glenn Kasten | 2013-06-18 | 6 | -0/+568 | |
* | | | | | | am 9a25c012: am eced745a: Merge "Part of fix for TEE resource leaks when app ... | Jeff Tinker | 2013-07-07 | 2 | -1/+19 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | 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 ace2378c: am f59a4b39: fix scheduling policy service death detection | Eric Laurent | 2013-07-03 | 2 | -13/+31 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | 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 | |
| | |/ / / / / | ||||||
* | | | | | | | Include what is needed | Glenn Kasten | 2013-07-02 | 14 | -29/+13 | |
| |_|_|/ / / |/| | | | | | ||||||
* | | | | | | Merge "Camera2Api: Creating a JPEG stream needs to use the right size" | Eino-Ville Talvala | 2013-07-01 | 1 | -2/+17 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Camera2Api: Creating a JPEG stream needs to use the right size | Eino-Ville Talvala | 2013-07-01 | 1 | -2/+17 | |
* | | | | | | | am f64bd473: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release -... | The Android Open Source Project | 2013-07-01 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | | | | | | | ||||||
| | \ \ \ \ \ | ||||||
| *-. \ \ \ \ \ | 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 0eefffd8: am 47a1fe04: am a9aa6baa: Merge "Set u.ext_data to null after it... | Andreas Huber | 2013-06-28 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | 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 903871da: am 83790fcc: am bdf33c98: Merge "Fix compilation warning: incorr... | Glenn Kasten | 2013-06-28 | 1 | -1/+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 | |
| | | |/ / / / / / | ||||||
* | | | | | | | | | Merge "Public API changes for audio offload support." | Eric Laurent | 2013-06-28 | 29 | -65/+281 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Public API changes for audio offload support. | Richard Fitzgerald | 2013-06-27 | 29 | -65/+281 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
* | | | | | | | | | resolved conflicts for merge of 364a2677 to master | Eino-Ville Talvala | 2013-06-28 | 2 | -32/+84 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | ||||||
| * | | | | | | | 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 | |
* | | | | | | | | am bdebd481: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-06-25 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | 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 1aee0be6: am 3a4ff0b8: am d74a9ee8: Merge "libstagefright: fix the duratio... | Jean-Baptiste Queru | 2013-06-25 | 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 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | |