summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* visualizer: reset buffer if playback is idleEric Laurent2011-11-101-3/+25
* Merge "Send RTSP control connection keep-alive requests" into ics-mr1Andreas Huber2011-11-101-2/+92
|\
| * Send RTSP control connection keep-alive requestsAndreas Huber2011-11-081-2/+92
* | Merge "Don't believe the PV decoder's lies..." into ics-mr1Andreas Huber2011-11-101-1/+6
|\ \
| * | Don't believe the PV decoder's lies...Andreas Huber2011-11-091-1/+6
| |/
* | Merge "There's no point in trying to continue to decode after an error was si...Andreas Huber2011-11-102-8/+11
|\ \
| * | There's no point in trying to continue to decode after an error was signalled.Andreas Huber2011-11-092-8/+11
| |/
* | am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into...Glenn Kasten2011-11-091-1/+1
|\ \
| * | Bug 5478024 drop after decode if can't drop beforeGlenn Kasten2011-11-041-1/+1
* | | Fix regression for SoundPool playbackEric Laurent2011-11-081-2/+7
| |/ |/|
* | Merge "Remove surface legacy APIs and code." into ics-mr1Andreas Huber2011-11-0818-76/+1
|\ \
| * | Remove surface legacy APIs and code.Andreas Huber2011-10-2818-76/+1
* | | Merge "AudioFlinger: mix track only when really ready" into ics-mr1Eric Laurent2011-11-081-1/+10
|\ \ \
| * | | AudioFlinger: mix track only when really readyEric Laurent2011-11-031-1/+10
* | | | Merge "Fix a hang issue where the first frame can be dropped for timelapse vi...James Dong2011-11-071-0/+6
|\ \ \ \
| * | | | Fix a hang issue where the first frame can be dropped for timelapse video rec...James Dong2011-10-261-0/+6
* | | | | Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-070-0/+0
|\ \ \ \ \
| * | | | | DO NOT MERGE Poll input data with a small timeout and don't consume a full core.Andreas Huber2011-11-041-1/+1
* | | | | | Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1Eric Laurent2011-11-041-17/+26
|\ \ \ \ \ \
| * | | | | | Fix device management in lvm effect bundle wrapper.Eric Laurent2011-11-011-17/+26
| | |_|_|/ / | |/| | | |
* | | | | | Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1Eric Laurent2011-11-041-9/+19
|\ \ \ \ \ \
| * | | | | | Fix problem in lvm effect bundle wrapper.Eric Laurent2011-11-021-9/+19
| | |_|_|/ / | |/| | | |
* | | | | | Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-040-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"The Android Automerger2011-11-021-11/+9
| * | | | | merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-11-021-9/+11
* | | | | | am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeo...Dave Burke2011-11-040-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | DO NOT MERGE Poll input data with a small timeout and don't consume a full core.Andreas Huber2011-11-031-1/+1
* | | | | | Poll input data with a small timeout and don't consume a full core.Andreas Huber2011-11-031-1/+1
* | | | | | Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-020-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | |
| * | | | Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"The Android Automerger2011-11-021-11/+9
| |/ / /
* | | | am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0Chih-Chung Chang2011-11-011-9/+11
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Merge "Update camera continuous autofocus javadoc." into ics-mr0Chih-Chung Chang2011-10-311-9/+11
| |\ \
| | * | Update camera continuous autofocus javadoc.Wu-cheng Li2011-10-281-9/+11
* | | | Merge "Properly report that we're no longer playing after receiving event" in...Andreas Huber2011-10-283-4/+17
|\ \ \ \
| * | | | Properly report that we're no longer playing after receiving eventAndreas Huber2011-10-263-4/+17
* | | | | am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics...Jamie Gennis2011-10-284-100/+65
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Stagefright: ANW::connect in MediaPlayerServiceJamie Gennis2011-10-264-100/+65
* | | | | Merge "Report call status from AudioSource::start() to file writer" into ics-mr1James Dong2011-10-272-2/+10
|\ \ \ \ \
| * | | | | Report call status from AudioSource::start() to file writerJames Dong2011-10-262-2/+10
| | |_|_|/ | |/| | |
* | | | | Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1Andreas Huber2011-10-271-8/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix a reference to a stale pointer in AwesomePlayer.Andreas Huber2011-10-261-8/+10
| | |/ / | |/| |
* | | | am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into i...Jamie Gennis2011-10-262-0/+161
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Stagefright: push blank buffers when tearing downJamie Gennis2011-10-252-0/+161
| |/
* | am 23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0Dave Burke2011-10-197-1/+68
|\ \ | |/
| * Merge "Stagefright: idle OMX after ANW errors" into ics-mr0Dave Burke2011-10-197-1/+68
| |\
| | * Stagefright: idle OMX after ANW errorsJamie Gennis2011-10-197-1/+68
* | | am f806871f: Fix 5487571: Make sure shutter sound is played when it\'s enforcedChih-Chung Chang2011-10-191-8/+2
|\ \ \ | |/ /
| * | Fix 5487571: Make sure shutter sound is played when it's enforcedChih-Chung Chang2011-10-201-8/+2
* | | am b3cdadb6: Merge "Check whether media recorder client exists before dumping...James Dong2011-10-191-5/+7
|\ \ \ | |/ /
| * | Merge "Check whether media recorder client exists before dumping." into ics-mr0James Dong2011-10-191-5/+7
| |\ \