summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Revert "Use pread() to get the decrypted data for container based DRM file."James Dong2011-05-251-7/+0
* Merge "Multi-repository checkin, goes with https://android-git.corp.google.co...Jeffrey Tinker2011-05-232-19/+19
|\
| * Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038Jeffrey Tinker2011-05-232-19/+19
* | Add some logging to track down where ANR happens during MediaPlayer._release().James Dong2011-05-232-1/+7
* | Use pread() to get the decrypted data for container based DRM file.Gloria Wang2011-05-201-0/+7
|/
* Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" in...James Dong2011-05-184-29/+155
|\
| * Using widevine:// to stream adaptive bitrate wvm content no longerAndreas Huber2011-05-104-29/+155
* | Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into h...Gloria Wang2011-05-182-8/+4
|\ \
| * | DO NOT MERGEGloria Wang2011-05-132-8/+4
| |/
* | StorageVolume: Add getStorageId() accessorMike Lockwood2011-05-171-7/+8
* | Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(code...Andreas Huber2011-05-171-1/+7
|\ \
| * | DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-speci...Andreas Huber2011-05-041-1/+7
* | | Merge "DO NOT MERGE. Integrate from master: Rework display size access." int...Dianne Hackborn2011-05-161-2/+2
|\ \ \
| * | | DO NOT MERGE. Integrate from master: Rework display size access.Dianne Hackborn2011-05-161-2/+2
| | |/ | |/|
* | | MTP: Have GetStorageInfo command return correct storage type for removable st...Mike Lockwood2011-05-164-7/+30
* | | StorageManager: Clean up and generalize storage configuration resourcesMike Lockwood2011-05-161-2/+1
|/ /
* | Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2The Android Automerger2011-05-082-1/+12
|\ \ | |/ |/|
| * docs: add package description for mtp and a little more info to MtpDeviceScott Main2011-05-052-1/+12
* | DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoM...Mike Lockwood2011-05-031-29/+37
* | DO NOT MERGE MediaScanner: Fix bug in "no media" handling logicMike Lockwood2011-05-031-3/+4
* | DO NOT MERGE MTP: Implement GetThumb commandMike Lockwood2011-05-037-2/+100
* | DO NOT MERGE MTP: Fix file descriptor leak in file editing extensionsMike Lockwood2011-05-032-24/+29
* | DO NOT MERGE MTP: Add extended operations to support in-place editing of filesMike Lockwood2011-05-036-38/+280
* | DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...Mike Lockwood2011-05-034-121/+122
* | DO NOT MERGE Fix media scanner uri handling.Marco Nelissen2011-05-031-21/+13
* | DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-039-104/+288
|/
* Add avg bandwidth estimate every 2 seconds - do not merge.James Dong2011-04-282-0/+12
* Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
* Enable HDCP debugging in Stagefright (1 of 2)Glenn Kasten2011-04-111-1/+1
* Stagefright: authenticate ANativeWindow.Jamie Gennis2011-04-081-0/+24
* Improve Javadoc for USB Manager and MTP/PTP support.Mike Lockwood2011-04-012-10/+31
* Bug 4167061Glenn Kasten2011-03-301-1/+1
* 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
* | Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.Andreas Huber2011-03-292-4/+4
|/
* 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
* | Make sure we post a video event when seeking after seeing video EOS before.Andreas Huber2011-03-251-2/+17
|/
* Switch to use SF cached sourceJames Dong2011-03-251-6/+1
* 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
* | Merge "Fix for Media Server memory leak" into honeycomb-mr1shailendra2011-03-231-14/+18
|\ \ | |/ |/|
| * Fix for Media Server memory leakshailendra2011-03-221-14/+18
* | 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
* | 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
* | | 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
* | | If nothing is to be copied, return right away.Andreas Huber2011-03-211-0/+4
| |/ |/|