summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* MTP: More prototyping work:Mike Lockwood2010-05-1810-170/+858
* am f62b6ff9: am eb8f850d: Fix issue 2553359: Pandora does not work well with ...Eric Laurent2010-05-172-77/+107
|\
| * Fix issue 2553359: Pandora does not work well with Passion deskdock / Cardock.Eric Laurent2010-05-172-77/+107
* | Add -p option to mtptest program to run in PTP mode instead of MTPMike Lockwood2010-05-172-4/+29
* | am bc30d1d8: am 5d75a181: am a5cd816c: am eb9128f9: Fix sampleTable instantia...Andreas Huber2010-05-141-1/+2
|\ \ | |/
| * am a5cd816c: am eb9128f9: Fix sampleTable instantiation, this makes sure that...Andreas Huber2010-05-141-1/+2
| |\
| | * am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample t...Andreas Huber2010-05-141-1/+2
| | |\
| | | * Fix sampleTable instantiation, this makes sure that the sample table refers t...Andreas Huber2010-05-141-1/+2
* | | | am ce3d8b31: am d95266c6: Merge "Detect and handle premature termination of a...James Dong2010-05-143-7/+17
|\ \ \ \ | |/ / /
| * | | Merge "Detect and handle premature termination of a recording session" into k...James Dong2010-05-143-7/+17
| |\ \ \
| | * | | Detect and handle premature termination of a recording sessionJames Dong2010-05-143-7/+17
* | | | | am f4ca2ad0: am f55e3222: Merge "Fix issue 2622023 Clean up all hardcoded \'/...Ray Chen2010-05-141-7/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix issue 2622023 Clean up all hardcoded '/sdcard' in camera related c...Ray Chen2010-05-141-7/+7
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix issue 2622023 Clean up all hardcoded '/sdcard' in camera related codes.Ray Chen2010-05-141-7/+7
* | | | | am 612058d1: am 9db798d0: Audio/video initial recording time synchronizationJames Dong2010-05-141-0/+34
|\ \ \ \ \ | |/ / / /
| * | | | Audio/video initial recording time synchronizationJames Dong2010-05-141-0/+34
* | | | | am 8b3611ee: am 1824486e: Handle recording file size and/or duration limitJames Dong2010-05-143-0/+103
|\ \ \ \ \ | |/ / / /
| * | | | Handle recording file size and/or duration limitJames Dong2010-05-143-0/+103
* | | | | am 63c93077: am 21a534d9: am 1d628c5d: merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 1d628c5d: merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
| | |\ \ \
| | | * \ \ Merge "Accept media files by file extension in case insensitive manner."Jean-Baptiste Queru2010-05-141-1/+1
| | | |\ \ \
| | | | * | | Accept media files by file extension in case insensitive manner.Atsushi Eno2010-03-191-1/+1
* | | | | | | am b9381956: am ead68d5c: Merge "Remove libdrm2. This code appears to be unu...Nick Kralevich2010-05-14123-19517/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Remove libdrm2. This code appears to be unused." into krakenNick Kralevich2010-05-14123-19517/+0
| |\ \ \ \ \ \
| | * | | | | | Remove libdrm2. This code appears to be unused.Nick Kralevich2010-05-13123-19517/+0
* | | | | | | | Move MTP code to the android namespaceMike Lockwood2010-05-1428-8/+109
* | | | | | | | am 79dfb675: am ffd104a9: Merge "Remove dummy surface in CameraSource" into k...James Dong2010-05-132-46/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Remove dummy surface in CameraSourceJames Dong2010-05-132-46/+3
* | | | | | | | Exclude mtptest program from simulator builds.Mike Lockwood2010-05-131-0/+4
* | | | | | | | Checkpoint work on MTP and PTP investigation.Mike Lockwood2010-05-1331-0/+3656
* | | | | | | | am 9df829bf: am fae47fd0: am 28fadef2: am 3c78a1b5: Return a runtime error in...Andreas Huber2010-05-132-3/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 28fadef2: am 3c78a1b5: Return a runtime error instead of asserting if the ...Andreas Huber2010-05-132-3/+10
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is...Andreas Huber2010-05-132-3/+10
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Return a runtime error instead of asserting if the AACDecoder is passed an un...Andreas Huber2010-05-132-3/+10
* | | | | | | | am fb6bd833: am 7406eafe: should fix the buildMathias Agopian2010-05-121-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | should fix the buildMathias Agopian2010-05-121-0/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | am 6914e17a: am 08eff49f: am d9712b69: am b1235a57: Merge "Hide two audio foc...Xavier Ducrohet2010-05-121-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am d9712b69: am b1235a57: Merge "Hide two audio focus methods." into froyoXavier Ducrohet2010-05-121-0/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am b1235a57: Merge "Hide two audio focus methods." into froyoXavier Ducrohet2010-05-121-0/+2
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Hide two audio focus methods." into froyoXavier Ducrohet2010-05-111-0/+2
| | | |\ \ \ \
| | | | * | | | Hide two audio focus methods.Xavier Ducrohet2010-05-111-0/+2
* | | | | | | | am 11291901: am 550884e2: am bbafdc64: am 836b2d75: Merge "Don\'t clear the _...Marco Nelissen2010-05-121-2/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am bbafdc64: am 836b2d75: Merge "Don\'t clear the _data column in the audio_m...Marco Nelissen2010-05-121-2/+5
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, si...Marco Nelissen2010-05-121-2/+5
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Don't clear the _data column in the audio_meta table, since it isn'tMarco Nelissen2010-05-111-2/+5
| | | |/ / / /
* | | | | | | am 1d0e5599: am 11777d6f: am b003ad17: am e0dc80f8: Merge "Support for custom...Andreas Huber2010-05-123-4/+33
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b003ad17: am e0dc80f8: Merge "Support for customizable socket-read timeout...Andreas Huber2010-05-123-4/+33
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am e0dc80f8: Merge "Support for customizable socket-read timeouts through the...Andreas Huber2010-05-123-4/+33
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Support for customizable socket-read timeouts through the HTTP respons...Andreas Huber2010-05-113-4/+33
| | | |\ \ \ \