summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 88748e6d: am d86302df: Quiet the log.Dianne Hackborn2011-06-101-1/+1
|\
| * am d86302df: Quiet the log.Dianne Hackborn2011-06-091-1/+1
| |\
| | * Quiet the log.Dianne Hackborn2011-06-091-1/+1
* | | am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 s...James Dong2011-06-092-12/+0
|\ \ \ | |/ /
| * | 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 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line br...Conley Owens2011-06-09185-30089/+30089
|\ \ \ \
| * \ \ \ am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix ...Conley Owens2011-06-09185-30089/+30089
| |\ \ \ \
| | * \ \ \ Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"Conley Owens2011-06-09185-30089/+30089
| | |\ \ \ \
| | | * | | | stagefright aacenc/amrwbenc: Convert line breaks to Unix styleMans Rullgard2011-04-23185-30089/+30089
* | | | | | | am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fdsMarco Nelissen2011-06-091-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am a02d9bf9: Make sure we don\'t read from invalid fdsMarco Nelissen2011-06-091-0/+3
| |\ \ \ \ \ \
| | * | | | | | Make sure we don't read from invalid fdsMarco Nelissen2011-06-091-0/+3
| * | | | | | | am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor...Andreas Huber2011-06-021-17/+79
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | |
| | * | | | | DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abo...Andreas Huber2011-06-011-17/+79
| * | | | | | Merge "Improved conversion accuracy of exif geotag data"Conley Owens2011-04-291-13/+19
| |\ \ \ \ \ \
| | * | | | | | Improved conversion accuracy of exif geotag dataOscar Rydhe2011-01-171-13/+19
| * | | | | | | 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
| * | | | | | | am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value,...James Dong2011-04-041-2/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | When read() from AudioRecord returns 0 or negative value, report an error to ...James Dong2011-03-301-2/+3
* | | | | | | | am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted dat...James Dong2011-05-251-7/+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 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://...Jeffrey Tinker2011-05-232-19/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 ebae1923: am a5293d1c: Add some logging to track down where ANR happens du...James Dong2011-05-232-1/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container...Gloria Wang2011-05-201-0/+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 380244e9: am d148a499: Merge "Using widevine:// to stream adaptive bitrate...James Dong2011-05-184-29/+155
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit...Gloria Wang2011-05-182-8/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" ...Mike Lockwood2011-05-171-7/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS me...Andreas Huber2011-05-171-1/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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