summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | am e45796de: am dedc7b0f: Merge "Fix flush() followed by start()" into klp-devGlenn Kasten2013-10-171-0/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am dedc7b0f: Merge "Fix flush() followed by start()" into klp-devGlenn Kasten2013-10-171-0/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix flush() followed by start()" into klp-devGlenn Kasten2013-10-171-0/+9
| | |\ \ \ \ \
| | | * | | | | Fix flush() followed by start()Glenn Kasten2013-10-171-0/+9
* | | | | | | | am 694d0295: am 6fa20187: Make sure we get to discover that the cache is suff...Andreas Huber2013-10-171-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 6fa20187: Make sure we get to discover that the cache is sufficiently full...Andreas Huber2013-10-171-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Make sure we get to discover that the cache is sufficiently full againAndreas Huber2013-10-171-1/+1
| | |/ / / / /
* | | | | | | am b2059ff3: am f8f15b05: Merge "Fix race condition in AudioTrack::pause foll...Glenn Kasten2013-10-162-7/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f8f15b05: Merge "Fix race condition in AudioTrack::pause followed by start...Glenn Kasten2013-10-162-7/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix race condition in AudioTrack::pause followed by start" into klp-devGlenn Kasten2013-10-172-7/+9
| | |\ \ \ \ \
| | | * | | | | Fix race condition in AudioTrack::pause followed by startGlenn Kasten2013-10-162-7/+9
* | | | | | | | am fc24dc1a: am 787c0d04: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 787c0d04: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-150-0/+0
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
| | | | | |\ \ \ \ \ | | | | | | |_|_|/ / | | | | | |/| | | |
| | | | | | * | | | Camera: Skip AE precapture when possibleZhijun He2013-10-111-0/+12
| | | | | | * | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-100-0/+0
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-090-0/+0
| | | | | | | |\ \ \ \
| | | | | | | | * | | | Cleanup openRecord error handlingGlenn Kasten2013-10-075-3/+29
| | | | | | | | * | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-060-0/+0
| | | | | | | | |\ \ \ \
| | | | | | | | | * | | | TimedEventQueue takes a wake lockEric Laurent2013-10-043-3/+99
| | | | | | | | | * | | | fix offload audio effect proxy implementation uuidEric Laurent2013-10-041-1/+2
| | | | | | | | | * | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-020-0/+0
| | | | | | | | | |\ \ \ \
| | | | | | | | | | * | | | MediaCodecInfo: report supported color formats for non-native-window modeLajos Molnar2013-10-011-6/+6
| | | | | | | | | | * | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-010-0/+0
| | | | | | | | | | |\ \ \ \
| | | | | | | | | | | * \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-290-0/+0
| | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | * | | | Camera2 API: Hack: Always use async mode with GLConsumerEino-Ville Talvala2013-09-261-1/+18
| | | | | | | | | | | | * | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-260-0/+0
| | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | * \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-250-0/+0
| | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | * \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-240-0/+0
| | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | * | | | AudioTrack: fix music resumeEric Laurent2013-09-232-4/+6
| | | | | | | | | | | | | | | * | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-220-0/+0
| | | | | | | | | | | | | | | |\ \ \ \
* | | | | | | | | | | | | | | | \ \ \ \ am dddafa84: am 3defdab8: Merge "Camera: don\'t do hw support check for ZSL" ...Zhijun He2013-10-161-13/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 3defdab8: Merge "Camera: don\'t do hw support check for ZSL" into klp-devZhijun He2013-10-161-13/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge "Camera: don't do hw support check for ZSL" into klp-devZhijun He2013-10-161-13/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Camera: don't do hw support check for ZSLZhijun He2013-10-161-13/+5
| | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am 7f8c3973: am 120a8847: Merge "AudioTrack: fix head position after restore"...Eric Laurent2013-10-163-1/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 120a8847: Merge "AudioTrack: fix head position after restore" into klp-devEric Laurent2013-10-163-1/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge "AudioTrack: fix head position after restore" into klp-devEric Laurent2013-10-163-1/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | AudioTrack: fix head position after restoreEric Laurent2013-10-163-1/+26
| | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am ace8947d: am d5766875: AwesomePlayer: fix concurrent pause and teardownEric Laurent2013-10-161-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am d5766875: AwesomePlayer: fix concurrent pause and teardownEric Laurent2013-10-161-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | AwesomePlayer: fix concurrent pause and teardownEric Laurent2013-10-151-0/+6
| | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | am 8580679e: am 014e7fa2: Make Audio wakelock names less unique.Narayan Kamath2013-10-152-2/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 014e7fa2: Make Audio wakelock names less unique.Narayan Kamath2013-10-142-2/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Make Audio wakelock names less unique.Narayan Kamath2013-10-142-2/+23
| | |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | am b930056e: am b3cb72a1: SoundPool: handle new audio track eventEric Laurent2013-10-141-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am b3cb72a1: SoundPool: handle new audio track eventEric Laurent2013-10-131-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /