summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Expand)AuthorAgeFilesLines
* Remove curtain effect (it's unused).Chih-Chung Chang2011-06-301-4/+0
* Unlock the camera if media recorder fails to start recording.Wu-cheng Li2011-06-291-2/+3
* Add framework support for camcorder zoom.Wu-cheng Li2011-06-271-5/+10
* - Public part of the Metadata API.Gloria Wang2011-06-231-87/+211
* Merge "Timed text display format support: 1. Extract 3GPP global format descr...Gloria Wang2011-06-222-5/+667
|\
| * Timed text display format support:Gloria Wang2011-06-222-5/+667
* | Switch to use MediaMetadataRetriever to generate the project thumbnail when t...James Dong2011-06-211-6/+27
|/
* MTP: Add support for PTP variant of GetDeviceInfo result.Mike Lockwood2011-06-211-3/+3
* MTP: Fix some problems with GetObjectHandles and GetNumObjects commandsMike Lockwood2011-06-171-22/+68
* Second attempt to fix the broken buildJames Dong2011-06-141-1/+0
* Fix broken buildJames Dong2011-06-141-1/+1
* Update MediaPlayer and MediaRecorder javadocJames Dong2011-06-142-0/+31
* Support for setting a ParcelSurfaceTexture as the MediaPlayer sink.tedbo2011-06-131-6/+27
* MTP: Remove obsolete setPtpMode supportMike Lockwood2011-06-081-5/+0
* Merge "Add WebP Mime-Type support in Android Media File"Marco Nelissen2011-06-061-1/+3
|\
| * Add WebP Mime-Type support in Android Media FileVikas Arora2011-06-031-1/+3
* | Add some comment to MediaRecorder.stop() about the stop() failure (-1007)James Dong2011-05-261-0/+6
|/
* Extract embedded cover art (aka poster frame) in mp4 filesJames Dong2011-05-261-1/+1
* Merge "For out of band timed text support (timed text in a separate file)."Gloria Wang2011-05-251-4/+16
|\
| * For out of band timed text support (timed text in a separate file).Gloria Wang2011-05-251-4/+16
* | Issue 4364098: bluetooth SCO not workingEric Laurent2011-05-251-5/+1
* | Bluetooth SCO audio API improvements.Eric Laurent2011-05-252-89/+258
|/
* Bug 4184736 unhide MediaPlayer.setTextureGlenn Kasten2011-05-201-1/+6
* Merge "Publish setLocation() method as a public Java API"James Dong2011-05-191-5/+4
|\
| * Publish setLocation() method as a public Java APIJames Dong2011-05-181-5/+4
* | Merge "Add one more MIME type (audio/aac-adts) for aac file. Fix for bug 4463...Gloria Wang2011-05-191-0/+1
|\ \ | |/ |/|
| * Add one more MIME type (audio/aac-adts) for aac file.Gloria Wang2011-05-191-0/+1
* | am 53b988ba: am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId...Mike Lockwood2011-05-181-7/+8
|\ \ | |/ |/|
| * am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" ...Mike Lockwood2011-05-171-7/+8
| |\
| | * StorageVolume: Add getStorageId() accessorMike Lockwood2011-05-171-7/+8
| * | am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework...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
* | | | Make track informational event optional, depending on system propertyJames Dong2011-05-171-0/+4
* | | | resolved conflicts for merge of b107f4de to masterMike Lockwood2011-05-161-1/+12
|\ \ \ \ | |/ / /
| * | | am e23639e0: am 15afd076: Merge "MTP: Have GetStorageInfo command return corr...Mike Lockwood2011-05-161-1/+12
| |\ \ \ | | |/ /
| | * | MTP: Have GetStorageInfo command return correct storage type for removable st...Mike Lockwood2011-05-161-1/+12
| * | | am b822d246: am 0a93d875: Merge "StorageManager: Clean up and generalize sto...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: reimplement the ".nomedia" feature for hiding file...Mike Lockwood2011-05-032-89/+108
| | * | 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-034-46/+152
* | | | Support for storing geo information in the recorded mp4/3gpp file.James Dong2011-05-131-0/+34
* | | | Merge "Fix setDataSource(Context, Uri, Map<String,String> headers)"James Dong2011-05-111-7/+13
|\ \ \ \
| * | | | Fix setDataSource(Context, Uri, Map<String,String> headers)Andreas Huber2011-05-111-7/+13
* | | | | Expose the track informational event for testingJames Dong2011-05-111-2/+78
|/ / / /
* | | | am 9603fdee: am 0d560d45: am 9f7054fe: Merge "docs: add package description f...Scott Main2011-05-062-1/+12
|\ \ \ \ | |/ / /
| * | | am 0d560d45: am 9f7054fe: Merge "docs: add package description for mtp and a ...Scott Main2011-05-062-1/+12
| |\ \ \