summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | DO NOT MERGE MTP: Fix file descriptor leak in file editing extensionsMike Lockwood2011-05-042-24/+29
* | | | | | | am eeaf48ca: (-s ours) am fdb50e6f: DO NOT MERGE MTP: Add extended operations...Mike Lockwood2011-05-040-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am fdb50e6f: DO NOT MERGE MTP: Add extended operations to support in-place ed...Mike Lockwood2011-05-045-8/+268
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | DO NOT MERGE MTP: Add extended operations to support in-place editing of filesMike Lockwood2011-05-045-8/+268
* | | | | | | am f6df5b41: (-s ours) am fb623263: DO NOT MERGE MediaScanner: reimplement th...Mike Lockwood2011-05-040-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature fo...Mike Lockwood2011-05-042-16/+13
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...Mike Lockwood2011-05-042-16/+13
* | | | | | | am 21c0800f: (-s ours) am d3e4290c: DO NOT MERGE MTP and media provider suppo...Mike Lockwood2011-05-040-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage...Mike Lockwood2011-05-044-8/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-044-8/+9
* | | | | | Merge "Fix potential memory corruption in NuCachedSource2."Andreas Huber2011-05-041-0/+5
|\ \ \ \ \ \
| * | | | | | Fix potential memory corruption in NuCachedSource2.Andreas Huber2011-05-041-0/+5
| | |_|/ / / | |/| | | |
* | | | | | Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2Andreas Huber2011-05-041-1/+7
|/ / / / /
* | | | | Merge "Initial CL for the timed text support: - Add support for MP4 timed tex...Gloria Wang2011-05-0412-23/+496
|\ \ \ \ \
| * | | | | Initial CL for the timed text support:Gloria Wang2011-05-0312-23/+496
* | | | | | frameworks/base: android_native_buffer_t -> ANativeWindowBufferIliyan Malchev2011-05-035-13/+13
* | | | | | frameworks/base: switch CameraService to a HAL moduleIliyan Malchev2011-05-035-333/+675
* | | | | | frameworks/base: include system/core header camera.h in Camera.hIliyan Malchev2011-05-033-114/+20
|/ / / / /
* | | | | Merge "Add an auto-exposure lock feature to the Camera API."Eino-Ville Talvala2011-05-032-0/+23
|\ \ \ \ \
| * | | | | Add an auto-exposure lock feature to the Camera API.Eino-Ville Talvala2011-05-022-0/+23
* | | | | | Merge "remove last traces of copybit"Mathias Agopian2011-05-021-16/+0
|\ \ \ \ \ \
| * | | | | | remove last traces of copybitMathias Agopian2011-05-021-16/+0
* | | | | | | MediaScanner: Fix bug in "no media" handling logicMike Lockwood2011-05-021-3/+4
* | | | | | | Merge "Add setParameter/getParameter to MediaPlayer API. for bug 1982947"Gloria Wang2011-04-2915-0/+129
|\ \ \ \ \ \ \
| * | | | | | | Add setParameter/getParameter to MediaPlayer API.Gloria Wang2011-04-2915-0/+129
| |/ / / / / /
* | | | | | | Merge "Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350...Gloria Wang2011-04-294-17/+26
|\ \ \ \ \ \ \
| * | | | | | | Add DRM errors in the DRM frameworks to MediaErrors also.Gloria Wang2011-04-294-17/+26
| |/ / / / / /
* | | | | | | am a1f6a09a: (-s ours) am f181e416: am ec78f551: Add avg bandwidth estimate e...James Dong2011-04-290-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not...James Dong2011-04-292-0/+12
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.James Dong2011-04-292-0/+12
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Add avg bandwidth estimate every 2 seconds - do not merge.James Dong2011-04-282-0/+12
* | | | | | get rid of dependency on copybit HAL moduleMathias Agopian2011-04-281-2/+0
| |_|_|/ / |/| | | |
* | | | | Merge changes I22d9e018,Ib0701fcc,Ibc637918,I9eb7e002,I4adcec73Dima Zavin2011-04-2745-6118/+1267
|\ \ \ \ \
| * | | | | audioflinger: don't do work in constructor, instead do it in onFirstRefDima Zavin2011-04-272-2/+15
| * | | | | audioflinger: enumerate all the possible audio interfacesDima Zavin2011-04-272-129/+230
| * | | | | audio/media: convert to using the audio HAL and new audio defsDima Zavin2011-04-2733-1108/+888
| * | | | | libmedia: move AudioParameter out of AudioSystemDima Zavin2011-04-275-198/+266
| * | | | | audioflinger: move legacy audio hw/policy out to libhardware_legacyDima Zavin2011-04-2711-4813/+0
* | | | | | Merge "Fix omx_tests to no longer refer to test files that are no longer avai...Andreas Huber2011-04-272-8/+12
|\ \ \ \ \ \
| * | | | | | Fix omx_tests to no longer refer to test files that are no longer available.Andreas Huber2011-04-272-8/+12
| |/ / / / /
* | | | | | am d84df054: am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaEr...Gloria Wang2011-04-271-0/+11
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.hGloria Wang2011-04-271-0/+11
| |\ \ \ \ | | |/ / /
| | * | | am 83ddcdf7: Add heartbeat error codes into MediaErrors.hGloria Wang2011-04-271-0/+11
| | |\ \ \ | | | |/ /
| | | * | Add heartbeat error codes into MediaErrors.hGloria Wang2011-04-261-0/+11
* | | | | am 48dca4de: am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volumeEric Laurent2011-04-261-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volumeEric Laurent2011-04-261-0/+7
| |\ \ \ \ | | |/ / /
| | * | | am 223995dc: Fix issue 4335692: HDMI media volumeEric Laurent2011-04-261-0/+7
| | |\ \ \ | | | |/ /
| | | * | Fix issue 4335692: HDMI media volumeEric Laurent2011-04-251-0/+7
* | | | | Merge "Give PSP and QuickTime compatible mp4 files a chance to play"James Dong2011-04-251-0/+5
|\ \ \ \ \
| * | | | | Give PSP and QuickTime compatible mp4 files a chance to playJames Dong2011-04-071-0/+5