summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix missing cross-ref links in the MediaPlayer.java javadoc"James Dong2011-03-291-0/+4
|\
| * Fix missing cross-ref links in the MediaPlayer.java javadocJames Dong2011-03-291-0/+4
* | Merge "Fix media scanner uri handling."Marco Nelissen2011-03-291-21/+13
|\ \
| * | Fix media scanner uri handling.Marco Nelissen2011-03-291-21/+13
* | | Merge "Add a user-agent header to our RTSP requests."Andreas Huber2011-03-292-0/+33
|\ \ \
| * | | Add a user-agent header to our RTSP requests.Andreas Huber2011-03-292-0/+33
| | |/ | |/|
* | | Merge "Adding support for the '.mxmf' MIDI file extension."Andreas Huber2011-03-292-2/+4
|\ \ \
| * | | Adding support for the '.mxmf' MIDI file extension.Andreas Huber2011-03-292-2/+4
| |/ /
* | | Make sure we don't trigger a log warning if calling ALooper::stop() from the ...Andreas Huber2011-03-291-2/+21
|/ /
* | Merge "frameworks/base: some camera-interface cleanup"Iliyan Malchev2011-03-281-22/+0
|\ \
| * | frameworks/base: some camera-interface cleanupIliyan Malchev2011-03-281-22/+0
| |/
* | Ignore OMX codec messages once we're in ERROR state.Andreas Huber2011-03-282-1/+6
|/
* am a4a81aef: am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief p...Andreas Huber2011-03-281-0/+5
|\
| * am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn...Andreas Huber2011-03-281-0/+5
| |\
| | * Merge "After a seek there's a brief period where audio time isn't reestablish...Andreas Huber2011-03-281-0/+5
| | |\
| | | * After a seek there's a brief period where audio time isn't reestablished.Andreas Huber2011-03-251-0/+5
* | | | Merge "merge libsurfaceflinger_client into libgui"Mathias Agopian2011-03-255-6/+4
|\ \ \ \
| * | | | merge libsurfaceflinger_client into libguiMathias Agopian2011-03-255-6/+4
* | | | | am e2cb08bd: am 2fee96bc: am 1457ef74: Merge "Make sure we post a video event...Andreas Huber2011-03-251-2/+17
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 1457ef74: Merge "Make sure we post a video event when seeking after seeing...Andreas Huber2011-03-251-2/+17
| |\ \ \ | | |/ /
| | * | Make sure we post a video event when seeking after seeing video EOS before.Andreas Huber2011-03-251-2/+17
| | |/
* | | am 70a5b031: am 9fb98238: am 837430dd: Merge "Switch to use SF cached source"...James Dong2011-03-251-6/+1
|\ \ \ | |/ /
| * | am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1James Dong2011-03-251-6/+1
| |\ \ | | |/
| | * Switch to use SF cached sourceJames Dong2011-03-251-6/+1
* | | am 64233b86: am 503f4daf: am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug sett...Glenn Kasten2011-03-231-0/+37
|\ \ \ | |/ /
| * | am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1Glenn Kasten2011-03-231-0/+37
| |\ \ | | |/
| | * Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1Glenn Kasten2011-03-231-0/+37
| | |\
| | | * Bug 4159373 Use HDCP debug settingsGlenn Kasten2011-03-231-0/+37
* | | | am 6b49e9a8: am a450ef06: am ac390b8c: Merge "Fix for Media Server memory lea...shailendra2011-03-231-14/+18
|\ \ \ \ | |/ / /
| * | | am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1shailendra2011-03-231-14/+18
| |\ \ \ | | |/ /
| | * | Merge "Fix for Media Server memory leak" into honeycomb-mr1shailendra2011-03-231-14/+18
| | |\ \ | | | |/ | | |/|
| | | * Fix for Media Server memory leakshailendra2011-03-221-14/+18
* | | | Merge "Delay signaling the end of audio playback until all frames have actual...Andreas Huber2011-03-223-8/+55
|\ \ \ \
| * | | | Delay signaling the end of audio playback until all frames have actually played.Andreas Huber2011-03-223-8/+55
* | | | | Merge "Fix AAC encoder test util and remove files that are not needed"James Dong2011-03-2210-589/+15
|\ \ \ \ \
| * | | | | Fix AAC encoder test util and remove files that are not neededJames Dong2011-03-2110-589/+15
* | | | | | Merge "Fix AMRWB test util and remove useless files"James Dong2011-03-228-281/+13
|\ \ \ \ \ \
| * | | | | | Fix AMRWB test util and remove useless filesJames Dong2011-03-218-281/+13
| |/ / / / /
* | | | | | am 8e0f2d71: am b819dcd4: am 8483073e: Merge "Fix for testPropertiesWMVFile c...shailendra2011-03-221-4/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI7...shailendra2011-03-221-4/+11
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" ...shailendra2011-03-221-4/+11
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)shailendra2011-03-181-4/+11
| * | | | am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls,...Andreas Huber2011-03-222-3/+27
| |\ \ \ \ | | |/ / /
| | * | | Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsin...Andreas Huber2011-03-222-3/+27
| | |\ \ \
| | | * | | DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.Andreas Huber2011-03-212-3/+27
* | | | | | am 5460bb3e: am 112852b5: am 02109972: Merge "Add the mem logging into test u...Yu Shan Emily Lau2011-03-221-67/+68
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into...Yu Shan Emily Lau2011-03-211-67/+68
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1Yu Shan Emily Lau2011-03-211-67/+68
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Add the mem logging into test utility.Yu Shan Emily Lau2011-03-181-67/+68
* | | | | | am 6834f061: am 970d7dd9: am e2c32e9f: If nothing is to be copied, return rig...Andreas Huber2011-03-221-0/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |