summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.Mike Lockwood2011-04-012-10/+31
|\
| * Improve Javadoc for USB Manager and MTP/PTP support.Mike Lockwood2011-04-012-10/+31
* | am ffa670b5: Bug 4167061Glenn Kasten2011-03-311-1/+1
|\ \ | |/
| * Bug 4167061Glenn Kasten2011-03-301-1/+1
* | am b676b73e: Merge "When http streaming and Content-Length is unknown, make s...Andreas Huber2011-03-301-1/+8
|\ \ | |/
| * Merge "When http streaming and Content-Length is unknown, make sure to return...Andreas Huber2011-03-301-1/+8
| |\
| | * When http streaming and Content-Length is unknown, make sure to return allAndreas Huber2011-03-301-1/+8
* | | am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/b...Andreas Huber2011-03-302-4/+4
|\ \ \ | |/ /
| * | Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.Andreas Huber2011-03-292-4/+4
| |/
* | 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
* | | 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 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 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 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
* | | 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 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 e2c32e9f: If nothing is to be copied, return right away.Andreas Huber2011-03-211-0/+4
|\ \ \ \ | |/ / /
| * | | If nothing is to be copied, return right away.Andreas Huber2011-03-211-0/+4
| | |/ | |/|
* | | am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertie...shailendra2011-03-182-1/+5
|\ \ \ | |/ /
| * | Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsiti...shailendra2011-03-182-1/+5
| |\ \
| | * | Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile ...shailendra2011-03-172-1/+5
* | | | am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framewor...James Dong2011-03-176-0/+95
|\ \ \ \ | |/ / /
| * | | Fix missing AOSP copyright headers for a bunch of media framework filesJames Dong2011-03-176-0/+95
* | | | am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been ...Mike Lockwood2011-03-171-2/+13
|\ \ \ \ | |/ / /
| * | | MtpServer: Do not attempt to stop MTP if it has not been startedMike Lockwood2011-03-171-2/+13
| |/ /
* | | am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which e...Yu Shan Emily Lau2011-03-162-2/+110
|\ \ \ | |/ /
| * | Merge "Suppress the 1 hour video editor export test case which exceed the 5 m...Yu Shan Emily Lau2011-03-162-2/+110
| |\ \ | | |/
| | * Suppress the 1 hour video editor export test case which exceed the 5 mins lar...Yu Shan Emily Lau2011-03-162-2/+110
* | | am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni...Rajneesh Chowdury2011-03-162-0/+24
|\ \ \ | |/ /
| * | Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honey...Rajneesh Chowdury2011-03-162-0/+24
| |\ \
| | * | Fix for 4087846 Crash reported by monkey report (Java/Jni)Rajneesh Chowdury2011-03-152-0/+24
* | | | am fc591762: Merge "Add the default camera id to mCameraIds for emulator and ...James Dong2011-03-161-0/+5
|\ \ \ \ | |/ / /
| * | | Add the default camera id to mCameraIds for emulator and those devices withou...James Dong2011-03-161-0/+5
* | | | am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-...Andreas Huber2011-03-161-12/+5
|\ \ \ \ | |/ / /
| * | | DO NOT MERGE: Fix a race condition when playing an audio-only stream and seek...Andreas Huber2011-03-161-12/+5
| | |/ | |/|