summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am d86302df: Quiet the log.Dianne Hackborn2011-06-091-1/+1
|\
| * Quiet the log.Dianne Hackborn2011-06-091-1/+1
* | am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do n...James Dong2011-06-092-12/+0
|\ \ | |/
| * Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" i...James Dong2011-06-092-12/+0
| |\
| | * Revert "Add avg bandwidth estimate every 2 seconds - do not merge."James Dong2011-05-192-12/+0
* | | am c1ded373: Merge "Revert "Use pread() to get the decrypted data for contain...James Dong2011-05-251-7/+0
|\ \ \ | |/ /
| * | Revert "Use pread() to get the decrypted data for container based DRM file."James Dong2011-05-251-7/+0
* | | am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.c...Jeffrey Tinker2011-05-232-19/+19
|\ \ \ | |/ /
| * | 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
| | |/
* | | am a5293d1c: Add some logging to track down where ANR happens during MediaPla...James Dong2011-05-232-1/+7
|\ \ \ | |/ /
| * | Add some logging to track down where ANR happens during MediaPlayer._release().James Dong2011-05-232-1/+7
* | | am a6f1104b: Use pread() to get the decrypted data for container based DRM fi...Gloria Wang2011-05-201-0/+7
|\ \ \ | |/ /
| * | Use pread() to get the decrypted data for container based DRM file.Gloria Wang2011-05-201-0/+7
| |/
* | am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content ...James Dong2011-05-184-29/+155
|\ \ | |/
| * 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
* | | am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the follo...Gloria Wang2011-05-182-8/+4
|\ \ \ | |/ /
| * | 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
| | |/
* | | am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycom...Mike Lockwood2011-05-171-7/+8
|\ \ \ | |/ /
| * | StorageVolume: Add getStorageId() accessorMike Lockwood2011-05-171-7/+8
* | | am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even i...Andreas Huber2011-05-171-1/+7
|\ \ \ | |/ /
| * | 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
* | | | am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size...Dianne Hackborn2011-05-161-2/+2
|\ \ \ \ | |/ / /
| * | | 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
| | | |/ | | |/|
* | | | am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage t...Mike Lockwood2011-05-164-7/+30
|\ \ \ \ | |/ / /
| * | | MTP: Have GetStorageInfo command return correct storage type for removable st...Mike Lockwood2011-05-164-7/+30
* | | | am 0a93d875: Merge "StorageManager: Clean up and generalize storage configur...Mike Lockwood2011-05-161-2/+1
|\ \ \ \ | |/ / /
| * | | 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
| |\ \ | | |/ | |/|
| * | 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
* | | am 9f7054fe: Merge "docs: add package description for mtp and a little more i...Scott Main2011-05-062-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-041-29/+37
* | DO NOT MERGE MediaScanner: Fix bug in "no media" handling logicMike Lockwood2011-05-041-3/+4
* | DO NOT MERGE MTP: Implement GetThumb commandMike Lockwood2011-05-047-2/+100
* | DO NOT MERGE MTP: Fix file descriptor leak in file editing extensionsMike Lockwood2011-05-042-24/+29
* | DO NOT MERGE MTP: Add extended operations to support in-place editing of filesMike Lockwood2011-05-046-38/+280
* | DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...Mike Lockwood2011-05-044-121/+122
* | DO NOT MERGE Fix media scanner uri handling.Marco Nelissen2011-05-041-21/+13