summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add DRM errors in the DRM frameworks to MediaErrors also.Gloria Wang2011-04-294-17/+26
* 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
* | | | | Merge "Fix memory leak from retrieval of getSupportedDrmInfo."James Dong2011-04-251-0/+2
|\ \ \ \ \
| * | | | | Fix memory leak from retrieval of getSupportedDrmInfo.James Dong2011-04-241-0/+2
* | | | | | MTP: Implement GetThumb commandMike Lockwood2011-04-255-1/+34
* | | | | | Merge "MTP: Fix file descriptor leak in file editing extensions"Mike Lockwood2011-04-252-24/+29
|\ \ \ \ \ \
| * | | | | | MTP: Fix file descriptor leak in file editing extensionsMike Lockwood2011-04-252-24/+29
* | | | | | | Merge "Return status code from invoke()"James Dong2011-04-251-4/+5
|\ \ \ \ \ \ \
| * | | | | | | Return status code from invoke()James Dong2011-04-061-4/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "MediaScanner: reimplement the ".nomedia" feature for hiding files from...Mike Lockwood2011-04-252-16/+13
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | MediaScanner: reimplement the ".nomedia" feature for hiding files from the me...Mike Lockwood2011-04-252-16/+13
* | | | | | | Merge "Remove log spam"Mike Lockwood2011-04-251-2/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Remove log spamMike Lockwood2011-04-241-2/+0
| | |/ / / / | |/| | | |
* | | | | | Merge "Clarify the meaning of weight in the focus and metering area HAL."Eino-Ville Talvala2011-04-251-9/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Clarify the meaning of weight in the focus and metering area HAL.Eino-Ville Talvala2011-04-251-9/+12
* | | | | | Merge "MTP: Add extended operations to support in-place editing of files"Mike Lockwood2011-04-235-8/+268
|\ \ \ \ \ \
| * | | | | | MTP: Add extended operations to support in-place editing of filesMike Lockwood2011-04-225-8/+268
* | | | | | | Remove the assertion and report content malform error to applicationJames Dong2011-04-221-5/+9
|/ / / / / /
* | | | | | Merge "Get rid of the "pid" parameter from createSurface"Mathias Agopian2011-04-212-2/+0
|\ \ \ \ \ \
| * | | | | | Get rid of the "pid" parameter from createSurfaceMathias Agopian2011-04-202-2/+0
* | | | | | | Add extra headers specified in the media player's setDataSource callAndreas Huber2011-04-205-22/+57
|/ / / / / /
* | | | | | Make sure a read restarts the prefetcher if necessary.Andreas Huber2011-04-192-7/+21
* | | | | | Merge "Remove streamability verification, it's taking too long. Also..."Andreas Huber2011-04-194-136/+128
|\ \ \ \ \ \
| * | | | | | Remove streamability verification, it's taking too long. Also...Andreas Huber2011-04-154-136/+128
| |/ / / / /
* | | | | | am 67dc13ed: (-s ours) am 5ce9eb9a: (-s ours) am f0f1ceeb: DO NOT MERGE: Make...Andreas Huber2011-04-180-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | am 5ce9eb9a: (-s ours) am f0f1ceeb: DO NOT MERGE: Make sure we restart the pr...Andreas Huber2011-04-180-0/+0
| |\ \ \ \
| | * \ \ \ am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately wh...Andreas Huber2011-04-183-12/+26
| | |\ \ \ \
| | | * | | | DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to ...Andreas Huber2011-04-143-12/+26
* | | | | | | Merge "- Add another parameter in notify() to be able to send timed text samp...Gloria Wang2011-04-138-16/+34
|\ \ \ \ \ \ \
| * | | | | | | - Add another parameter in notify() to be able to send timed text sampleGloria Wang2011-04-138-16/+34
* | | | | | | | am 8d2e14da: am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |