summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | 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
| | |/ / / | |/| | |
* | | | | am 3fabad87: Merge "Fix for Don\'t allow adding 64-bit files(4086708)" into h...Shailendra Yadav2011-03-144-2/+26
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix for Don't allow adding 64-bit files(4086708)" into honeycomb-mr1Shailendra Yadav2011-03-144-2/+26
| |\ \ \ \
| | * | | | Fix for Don't allow adding 64-bit files(4086708)Shailendra Yadav2011-03-144-2/+26
* | | | | | am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"Kenny Root2011-03-141-5/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"Kenny Root2011-03-111-5/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Remove unnecessary SkImageDecoder_libjpeg.cppChih-Wei Huang2011-03-101-5/+0
| * | | | | am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into g...James Dong2011-03-112-8/+47
| |\ \ \ \ \
| | * | | | | MP3Extractor and MP3 decoder fixes - DO NOT MERGEJames Dong2011-03-112-8/+47
* | | | | | | am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into h...Eric Laurent2011-03-141-26/+22
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1Eric Laurent2011-03-141-26/+22
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Partial fix for issue 3515250: video chat and SCOEric Laurent2011-03-121-26/+22
* | | | | | | am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" ...Mike Lockwood2011-03-141-0/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MtpDevice: Handle zero length packets in readResponse()Mike Lockwood2011-03-141-0/+4
* | | | | | | am dec0b755: Merge "MTP host: Fix problems reading large data packets" into h...Mike Lockwood2011-03-141-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MTP host: Fix problems reading large data packetsMike Lockwood2011-03-121-3/+3
* | | | | | | am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1Mike Lockwood2011-03-112-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | USB: minor cleanup workMike Lockwood2011-03-112-2/+2
| |/ / / / /
* | | | | | am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1Mike Lockwood2011-03-118-21/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1Mike Lockwood2011-03-118-21/+28
| |\ \ \ \ \
| | * | | | | Remove MtpClient class from framework and public APIMike Lockwood2011-03-117-9/+9
| | * | | | | UsbDevice: Move IO related methods to new UsbDeviceConnection classMike Lockwood2011-03-112-12/+19
* | | | | | | am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1Glenn Kasten2011-03-112-0/+24
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Bug 3012968 DRM output controlGlenn Kasten2011-03-102-0/+24
| |/ / / / /
* | | | | | am a7118e33: Merge "Fix for 4080402 NPE in Transition.setDuration" into honey...Rajneesh Chowdury2011-03-102-7/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1Rajneesh Chowdury2011-03-102-7/+5
| |\ \ \ \ \
| | * | | | | Fix for 4080402 NPE in Transition.setDurationRajneesh Chowdury2011-03-102-7/+5
| | | |_|_|/ | | |/| | |
* | | | | | am 564f12eb: Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1Mike Lockwood2011-03-091-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1Mike Lockwood2011-03-091-2/+2
| |\ \ \ \ \
| | * | | | | MTP: Convert date created and modified values from seconds to millisecondsMike Lockwood2011-03-091-2/+2
* | | | | | | am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-091-14/+24
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-091-14/+24
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-081-14/+24
* | | | | | | am e4a02b61: am b9da16a1: Support IPv6 in HTTP streaming.Lorenzo Colitti2011-03-091-9/+17
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | am b9da16a1: Support IPv6 in HTTP streaming.Lorenzo Colitti2011-03-091-9/+17
| |\ \ \ \ \ | | |/ / / /