summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | 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
* | | | | | | | Merge "Adds VP9 decoding support for stagefright."Lajos Molnar2013-06-2512-25/+60
|\ \ \ \ \ \ \ \
| * | | | | | | | Adds VP9 decoding support for stagefright.hkuang2013-06-2412-25/+60
* | | | | | | | | Merge "Workaround AudioRecord bug for large buffer sizes"Glenn Kasten2013-06-251-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Workaround AudioRecord bug for large buffer sizesGlenn Kasten2013-06-241-1/+2
* | | | | | | | | | Merge "Use mFutex as an event flag rather than semaphore"Glenn Kasten2013-06-252-7/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Use mFutex as an event flag rather than semaphoreGlenn Kasten2013-06-242-7/+7
* | | | | | | | | | Merge changes I5b2eeab2,I71568560Igor Murashkin2013-06-2523-164/+1915
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make android.hardware.photography.Camera work on HAL3+ devicesIgor Murashkin2013-06-207-19/+129
| * | | | | | | | | | Initial implementation of android.hardware.photography.CameraDevice (service)Igor Murashkin2013-06-2020-145/+1786
* | | | | | | | | | | Merge "stagefright: support for video decoder metadata mode"Lajos Molnar2013-06-242-15/+195
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | stagefright: support for video decoder metadata modeLajos Molnar2013-06-212-15/+195
* | | | | | | | | | | am e6105c26: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-210-0/+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 455479bc: am 209bbbcf: Apply EQ and bass boost first in effect chainJean-Michel Trivi2013-06-201-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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
* | | | | | | | | camera2/3: Warn on missing active array size parametersAlex Ray2013-06-201-0/+2
* | | | | | | | | am d3ac2fc0: am f3e21c30: am 60f3f102: Merge "Prevent AudioCommands being fre...Glenn Kasten2013-06-201-6/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | 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 9c8714da: am e6478de7: Camera2/3: Avoid shutdown race in callback processor.Eino-Ville Talvala2013-06-191-1/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | / / | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | 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 bda5d1f2: am 241b5279: Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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
* | | | | | | | Merge "Speed up id3v2 unsynchronization"Marco Nelissen2013-06-171-5/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Speed up id3v2 unsynchronizationMarco Nelissen2013-06-171-5/+10