summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 046d9c8d: am 06197925: am 267363ee: Merge "Prevent Media Server crash whil...Jean-Baptiste Queru2013-07-081-1/+1
|\
| * am 06197925: am 267363ee: Merge "Prevent Media Server crash while the Awesome...Jean-Baptiste Queru2013-07-081-1/+1
| |\
| | * am 267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBit...Jean-Baptiste Queru2013-07-081-1/+1
| | |\
| | | * Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return t...Jean-Baptiste Queru2013-07-081-1/+1
| | | |\
| | | | * Prevent Media Server crash while the AwesomePlayer getBitrate return true wit...hovanchen2013-07-031-1/+1
* | | | | am 9f0e0597: am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in R...Jean-Baptiste Queru2013-07-081-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in RTSPSource"Jean-Baptiste Queru2013-07-081-0/+4
| |\ \ \ \ | | |/ / /
| | * | | am ca7f1609: Merge "Prevent double disconnects in RTSPSource"Jean-Baptiste Queru2013-07-081-0/+4
| | |\ \ \ | | | |/ /
| | | * | Merge "Prevent double disconnects in RTSPSource"Jean-Baptiste Queru2013-07-081-0/+4
| | | |\ \ | | | | |/ | | | |/|
| | | | * Prevent double disconnects in RTSPSourceFredrik Rosin2013-07-011-0/+4
| | | |/
* | | | Merge "Explicitly compare raw pointers to NULL"Glenn Kasten2013-07-081-18/+20
|\ \ \ \
| * | | | Explicitly compare raw pointers to NULLGlenn Kasten2013-07-021-18/+20
* | | | | Merge "mv libcpustats from frameworks/native to frameworks/av"Glenn Kasten2013-07-086-0/+568
|\ \ \ \ \
| * | | | | mv libcpustats from frameworks/native to frameworks/avGlenn Kasten2013-06-186-0/+568
* | | | | | am 9a25c012: am eced745a: Merge "Part of fix for TEE resource leaks when app ...Jeff Tinker2013-07-072-1/+19
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am eced745a: Merge "Part of fix for TEE resource leaks when app crashes" into...Jeff Tinker2013-07-072-1/+19
| |\ \ \ \ \
| | * \ \ \ \ Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-devJeff Tinker2013-07-072-1/+19
| | |\ \ \ \ \
| | | * | | | | Part of fix for TEE resource leaks when app crashesJeff Tinker2013-07-032-1/+19
* | | | | | | | am ace2378c: am f59a4b39: fix scheduling policy service death detectionEric Laurent2013-07-032-13/+31
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am f59a4b39: fix scheduling policy service death detectionEric Laurent2013-07-032-13/+31
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | fix scheduling policy service death detectionEric Laurent2013-07-022-13/+31
| | |/ / / / /
* | | | | | | Include what is neededGlenn Kasten2013-07-0214-29/+13
| |_|_|/ / / |/| | | | |
* | | | | | Merge "Camera2Api: Creating a JPEG stream needs to use the right size"Eino-Ville Talvala2013-07-011-2/+17
|\ \ \ \ \ \
| * | | | | | Camera2Api: Creating a JPEG stream needs to use the right sizeEino-Ville Talvala2013-07-011-2/+17
* | | | | | | am f64bd473: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release -...The Android Open Source Project2013-07-010-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | | | | | |
| | \ \ \ \ \
| *-. \ \ \ \ \ Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-010-0/+0
| |\ \ \ \ \ \ \
| | | * \ \ \ \ \ merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-300-0/+0
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Update HTTP proxy configuration for all media playback inside stagefright.Andreas Huber2013-06-2816-2/+172
* | | | | | | | | am 0eefffd8: am 47a1fe04: am a9aa6baa: Merge "Set u.ext_data to null after it...Andreas Huber2013-06-281-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 47a1fe04: am a9aa6baa: Merge "Set u.ext_data to null after it has been freed"Andreas Huber2013-06-281-0/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | am a9aa6baa: Merge "Set u.ext_data to null after it has been freed"Andreas Huber2013-06-281-0/+1
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge "Set u.ext_data to null after it has been freed"Andreas Huber2013-06-281-0/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | Set u.ext_data to null after it has been freedChrister Fletcher2013-06-281-0/+1
* | | | | | | | | | am 903871da: am 83790fcc: am bdf33c98: Merge "Fix compilation warning: incorr...Glenn Kasten2013-06-281-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 83790fcc: am bdf33c98: Merge "Fix compilation warning: incorrect format sp...Glenn Kasten2013-06-281-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am bdf33c98: Merge "Fix compilation warning: incorrect format specifier for t...Glenn Kasten2013-06-281-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge "Fix compilation warning: incorrect format specifier for type 'ssize_t'."Glenn Kasten2013-06-281-1/+1
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Fix compilation warning: incorrect format specifier for type 'ssize_t'.Scott Fan2013-06-271-1/+1
| | | |/ / / / / /
* | | | | | | | | Merge "Public API changes for audio offload support."Eric Laurent2013-06-2829-65/+281
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Public API changes for audio offload support.Richard Fitzgerald2013-06-2729-65/+281
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | resolved conflicts for merge of 364a2677 to masterEino-Ville Talvala2013-06-282-32/+84
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | am a691ff3c: Camera2/3: Don\'t allow recording and callbacks to coexist.Eino-Ville Talvala2013-06-282-29/+85
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Camera2/3: Don't allow recording and callbacks to coexist.Eino-Ville Talvala2013-06-272-29/+85
* | | | | | | | am bdebd481: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-250-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-250-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-240-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEADThe Android Automerger2013-06-240-0/+0
| | | |\ \ \ \ \
* | | | \ \ \ \ \ am 1aee0be6: am 3a4ff0b8: am d74a9ee8: Merge "libstagefright: fix the duratio...Jean-Baptiste Queru2013-06-250-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 3a4ff0b8: am d74a9ee8: Merge "libstagefright: fix the duration "00:00" for...Jean-Baptiste Queru2013-06-250-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | am d74a9ee8: Merge "libstagefright: fix the duration "00:00" for some httpliv...Jean-Baptiste Queru2013-06-250-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |