summaryrefslogtreecommitdiffstats
path: root/media/java/android
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * 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
| * | | am 36132a48: DO NOT MERGE MediaScanner: Add special casing of WMP album art f...Mike Lockwood2011-05-041-29/+37
| |\ \ \ | | |/ /
| | * | DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoM...Mike Lockwood2011-05-041-29/+37
| * | | am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature fo...Mike Lockwood2011-05-042-89/+108
| |\ \ \ | | |/ /
| | * | DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...Mike Lockwood2011-05-042-89/+108
| * | | am 7dd59229: DO NOT MERGE Fix media scanner uri handling.Marco Nelissen2011-05-041-21/+13
| |\ \ \ | | |/ /
| | * | DO NOT MERGE Fix media scanner uri handling.Marco Nelissen2011-05-041-21/+13
| * | | am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage...Mike Lockwood2011-05-044-46/+152
| |\ \ \ | | |/ /
| | * | DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-044-46/+152
| | |/
* | | Clean up JNI codeJames Dong2011-05-052-3/+32
* | | Initial CL for the timed text support:Gloria Wang2011-05-032-0/+46
* | | MediaScanner: Add special casing of WMP album art files to isNoMediaPath()Mike Lockwood2011-05-021-29/+37
* | | Add setParameter/getParameter to MediaPlayer API.Gloria Wang2011-04-291-0/+78
* | | MediaScanner: reimplement the ".nomedia" feature for hiding files from the me...Mike Lockwood2011-04-252-89/+108
* | | Merge "Rework display size access."Dianne Hackborn2011-04-211-2/+2
|\ \ \
| * | | Rework display size access.Dianne Hackborn2011-04-211-2/+2
* | | | Remove config_caseSensitiveExternalStorage; no longer needed.Dianne Hackborn2011-04-211-2/+1
|/ / /
* | | Unhide MediaPlayer's setDataSource method that takes optional http headers to beAndreas Huber2011-04-201-1/+0
* | | Merge "Fix bug 2659754 ConcurrentModificationException in audio focus changes"Jean-Michel Trivi2011-04-181-4/+4
|\ \ \
| * | | Fix bug 2659754 ConcurrentModificationException in audio focus changesJean-Michel Trivi2011-04-181-4/+4
* | | | Merge "Fix bug 2724503 Persist media button receiver across reboots"Jean-Michel Trivi2011-04-181-0/+81
|\ \ \ \ | |/ / /
| * | | Fix bug 2724503 Persist media button receiver across rebootsJean-Michel Trivi2011-04-181-0/+81
* | | | - Add another parameter in notify() to be able to send timed text sampleGloria Wang2011-04-131-0/+40
|/ / /
* | | Remove the deprecated things from Config.java. These haven't been working sin...Joe Onorato2011-04-075-14/+9
* | | Merge "Bug 4231349 fix error in javadoc for android.media.MediaPlayer"Jean-Michel Trivi2011-04-061-3/+8
|\ \ \
| * | | Bug 4231349 fix error in javadoc for android.media.MediaPlayerJean-Michel Trivi2011-04-061-3/+8
* | | | Merge "Miscellaneous code cleanup in audio framework"Glenn Kasten2011-04-061-72/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Miscellaneous code cleanup in audio frameworkGlenn Kasten2011-04-061-72/+16
* | | | MTP and media provider support for multiple storage devices:Mike Lockwood2011-04-054-46/+152
|/ / /
* | | am 1c56976a: am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MT...Mike Lockwood2011-04-012-10/+31
|\ \ \ | |/ /
| * | am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.Mike Lockwood2011-04-012-10/+31
| |\ \ | | |/
| | * Improve Javadoc for USB Manager and MTP/PTP support.Mike Lockwood2011-04-012-10/+31
* | | am 0ddcc8bc: am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when de...Brad Fitzpatrick2011-03-301-1/+3
|\ \ \ | |/ /
| * | am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images...Brad Fitzpatrick2011-03-301-1/+3
| |\ \ | | |/ | |/|
| | * Handle OutOfMemoryError when decoding images in ThumbnailUtilsChrister Fletcher2011-03-281-1/+3
| | * am 2ba92c71: do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-265-4/+21
| | |\
| | | * do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-265-4/+21
* | | | Support for divx files, i.e. mpeg 4 video + mpeg audio layer III in .avi filesAndreas Huber2011-03-301-1/+3
* | | | Merge "Fix missing cross-ref links in the MediaPlayer.java javadoc"James Dong2011-03-291-0/+4
|\ \ \ \
| * | | | Fix missing cross-ref links in the MediaPlayer.java javadocJames Dong2011-03-291-0/+4
* | | | | Merge "Fix media scanner uri handling."Marco Nelissen2011-03-291-21/+13
|\ \ \ \ \
| * | | | | Fix media scanner uri handling.Marco Nelissen2011-03-291-21/+13
| |/ / / /
* | | | | Adding support for the '.mxmf' MIDI file extension.Andreas Huber2011-03-291-0/+1
|/ / / /
* | | | Fix issue 3509396: AudioEffect.getParameter JAVA.Eric Laurent2011-03-211-53/+63
* | | | Support passing headers to MediaMetadataRetriever's setDataSource APIAndreas Huber2011-03-211-1/+15
* | | | Merge "Add support for timestamps into SurfaceTexture."Eino-Ville Talvala2011-03-171-0/+5
|\ \ \ \
| * | | | Add support for timestamps into SurfaceTexture.Eino-Ville Talvala2011-03-171-0/+5