summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | Prevent double disconnects in RTSPSourceFredrik Rosin2013-07-011-0/+4
| | |/ / / / / / / /
* | | | | | | | | | 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 f59a4b39: fix scheduling policy service death detectionEric Laurent2013-07-032-13/+31
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | fix scheduling policy service death detectionEric Laurent2013-07-022-13/+31
| |/ / / / / / / / /
| | | | | | | | | |
| \ \ \ \ \ \ \ \ \
*-. \ \ \ \ \ \ \ \ \ 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 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 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
| | |/ / / / / / / / /
* | | | | | | | | | | 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
* | | | | | | | | | | 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 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
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "libstagefright: fix the duration "00:00" for some httplive link"Jean-Baptiste Queru2013-06-251-3/+0
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | libstagefright: fix the duration "00:00" for some httplive linkywan1712012-08-241-3/+0
* | | | | | | | | | | | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | / / / / / / / | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | am 209bbbcf: Apply EQ and bass boost first in effect chainJean-Michel Trivi2013-06-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Apply EQ and bass boost first in effect chainJean-Michel Trivi2013-06-201-2/+2
* | | | | | | | | | | | am f3e21c30: am 60f3f102: Merge "Prevent AudioCommands being freed before read"Glenn Kasten2013-06-201-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am 60f3f102: Merge "Prevent AudioCommands being freed before read"Glenn Kasten2013-06-201-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "Prevent AudioCommands being freed before read"Glenn Kasten2013-06-201-6/+8
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Prevent AudioCommands being freed before readChrister Fletcher2013-06-201-6/+8
* | | | | | | | | | | | | am e6478de7: Camera2/3: Avoid shutdown race in callback processor.Eino-Ville Talvala2013-06-191-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Camera2/3: Avoid shutdown race in callback processor.Eino-Ville Talvala2013-06-191-1/+4
* | | | | | | | | | | | | am 241b5279: Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
* | | | | | | | | | | | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | am 26bc908b: Camera2/3: Make sure to wait for idle after still capture.Eino-Ville Talvala2013-06-141-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Camera2/3: Make sure to wait for idle after still capture.Eino-Ville Talvala2013-06-131-0/+6
* | | | | | | | | | | | | am 214a17fd: Camera3: Always close HAL device even in face of errors.Eino-Ville Talvala2013-06-141-10/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Camera3: Always close HAL device even in face of errors.Eino-Ville Talvala2013-06-131-10/+20
* | | | | | | | | | | | | am 82fc2ca6: am d5018116: Merge "Fix typo."Glenn Kasten2013-06-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am d5018116: Merge "Fix typo."Glenn Kasten2013-06-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Fix typo."Glenn Kasten2013-06-141-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Fix typo.Masaki Muranaka2013-06-061-1/+1
* | | | | | | | | | | | | am 1191454a: Merge "Camera3: Skipping no-ops good, not updating state machine...Eino-Ville Talvala2013-06-131-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge "Camera3: Skipping no-ops good, not updating state machine bad." into j...Eino-Ville Talvala2013-06-131-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \