summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | am 132b23f8: am c97022e7: am 11473332: Merge "MtpServer: Do not attempt to st...Mike Lockwood2011-03-171-2/+13
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | MtpServer: Do not attempt to stop MTP if it has not been startedMike Lockwood2011-03-171-2/+13
* | | | | am ce254e86: am 69d05490: am 0edefea8: Merge "Fix for 4087846 Crash reported ...Rajneesh Chowdury2011-03-161-0/+12
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honey...Rajneesh Chowdury2011-03-161-0/+12
| |\ \ \
| | * | | Fix for 4087846 Crash reported by monkey report (Java/Jni)Rajneesh Chowdury2011-03-151-0/+12
* | | | | Merge "Add a release() method to MediaScanner"James Dong2011-03-141-0/+11
|\ \ \ \ \
| * | | | | Add a release() method to MediaScannerJames Dong2011-03-111-0/+11
* | | | | | am e987cbaf: am 3fabad87: Merge "Fix for Don\'t allow adding 64-bit files(408...Shailendra Yadav2011-03-144-2/+26
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Fix for Don't allow adding 64-bit files(4086708)" into honeycomb-mr1Shailendra Yadav2011-03-144-2/+26
| |\ \ \ \ \
| | * | | | | Fix for Don't allow adding 64-bit files(4086708)Shailendra Yadav2011-03-144-2/+26
* | | | | | | am 733cb79a: am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat an...Eric Laurent2011-03-141-26/+22
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1Eric Laurent2011-03-141-26/+22
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Partial fix for issue 3515250: video chat and SCOEric Laurent2011-03-121-26/+22
* | | | | | | am 3b473d95: am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1Mike Lockwood2011-03-112-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | USB: minor cleanup workMike Lockwood2011-03-112-2/+2
| |/ / / /
* | | | | am 75c95e9a: am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into ho...Mike Lockwood2011-03-112-417/+11
|\ \ \ \ \ | |/ / / /