summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Expand)AuthorAgeFilesLines
* Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail...Andreas Huber2014-02-057-7/+405
|\
| * FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-047-7/+405
* | Cache media/nomedia pathsMarco Nelissen2014-02-041-16/+50
|/
* Fix invocation of notification callback in case the callback is modifiedAndreas Huber2014-01-271-3/+4
* API that allows usage of MediaCodec APIs without polling.Andreas Huber2014-01-271-1/+64
* Merge "Add "throws IOException" to MediaCodec factory methods"Andy Hung2014-01-211-6/+27
|\
| * Add "throws IOException" to MediaCodec factory methodsAndy Hung2014-01-161-6/+27
* | Resolved conflicts for merge of 28c6ec02 to masterNarayan Kamath2014-01-1614-23/+23
|\ \
| * \ am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media clas...Narayan Kamath2014-01-1614-23/+23
| |\ \
| | * | AArch64: Use long for pointers in media classesAshok Bhat2014-01-1514-23/+23
* | | | Merge "Unhide android.media.AudioTrack.setVolume(float)"Glenn Kasten2014-01-151-2/+6
|\ \ \ \
| * | | | Unhide android.media.AudioTrack.setVolume(float)Glenn Kasten2014-01-141-2/+6
| | |_|/ | |/| |
* | | | Merge "Use AUDIO_SESSION_ALLOCATE instead of hard-coded 0"Glenn Kasten2014-01-153-4/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Use AUDIO_SESSION_ALLOCATE instead of hard-coded 0Glenn Kasten2013-06-263-4/+7
* | | | Merge "Prepare for additional formats beyond 8-bit and 16-bit PCM"Glenn Kasten2014-01-131-1/+2
|\ \ \ \
| * | | | Prepare for additional formats beyond 8-bit and 16-bit PCMGlenn Kasten2014-01-101-1/+2
* | | | | Merge "setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager"Zhihai Xu2014-01-111-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManagerZhihai Xu2014-01-101-1/+1
* | | | | am 1e3395c7: am 105b545e: am 0dce19ca: am 79ceb53a: am c58abeea: Merge "AArch...Narayan Kamath2014-01-073-3/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"Narayan Kamath2014-01-073-3/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | AArch64: Use long for pointers in MTP classesAshok Bhat2014-01-073-3/+3
* | | | | am 510616d2: am bec733af: am 23ebc24e: am 08467c57: am 9bc6acf2: Merge "AArch...Narayan Kamath2014-01-071-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEdito...Narayan Kamath2014-01-071-1/+1
| |\ \ \ \ | | |/ / /
| | * | | AArch64: Use long for pointers in VideoEditor classesAshok Bhat2014-01-071-1/+1
* | | | | am 113e83e6: am 58cb0f0c: am bfbe585e: am c0c92f20: am 357ea905: Merge "AArch...Narayan Kamath2014-01-072-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effe...Narayan Kamath2014-01-072-4/+4
| |\ \ \ \ | | |/ / /
| | * | | AArch64: Use long for pointers in audio effect classesAshok Bhat2014-01-072-4/+4
* | | | | am 99aec6b5: am 40b0aaa9: am 568cde55: am 80cff944: am 74675f29: Merge "AArch...Narayan Kamath2014-01-071-6/+6
|\ \ \ \ \ | |/ / / /
| * | | | am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputSt...Narayan Kamath2014-01-071-6/+6
| |\ \ \ \ | | |/ / /
| | * | | AArch64: Use long for pointers in AmrInputStreamAshok Bhat2014-01-071-6/+6
* | | | | Merge "Fix RemoteController synchronization mode"Jean-Michel Trivi2014-01-061-1/+1
|\ \ \ \ \
| * | | | | Fix RemoteController synchronization modeJean-Michel Trivi2014-01-021-1/+1
* | | | | | MediaRecorder: add getSurface() api and SURFACE video sourceChong Zhang2014-01-061-3/+28
|/ / / / /
* | | | | ExifInterface: fix class load failureZhijun He2013-12-201-1/+1
* | | | | am 52ba48a8: am f08b83be: am 4dd5c377: am be8fbb8f: Merge "Remove unused fiel...Narayan Kamath2013-12-181-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | am be8fbb8f: Merge "Remove unused field from MediaMuxer"Narayan Kamath2013-12-181-2/+0
| |\ \ \ \ | | |/ / /
| | * | | Remove unused field from MediaMuxerNarayan Kamath2013-12-181-2/+0
* | | | | am 3bfc6e76: am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long ...Elliott Hughes2013-12-162-11/+11
|\ \ \ \ \ | |/ / / /
| * | | | am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"Elliott Hughes2013-12-162-11/+11
| |\ \ \ \ | | |/ / /
| | * | | Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"Elliott Hughes2013-12-162-11/+11
| | |\ \ \
| | | * | | AArch64: Use long for pointers in MediaDrm and MediaMuxerAshok Bhat2013-12-102-11/+11
* | | | | | resolved conflicts for merge of e0b14ea7 to masterKenny Root2013-12-131-4/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 37c69fdd: Merge "Use java.util.Objects instead on internal API"Kenny Root2013-12-131-4/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Use java.util.Objects instead on internal APIKenny Root2013-12-131-4/+3
| | |/ / /
* | | | | Add caption window color attributeAlan Viverette2013-12-111-0/+4
* | | | | Update comments for AudioRecord IllegalArgumentExceptionGlenn Kasten2013-12-021-3/+4
* | | | | Document need to call AudioRecord.getState() after constructionGlenn Kasten2013-12-021-0/+3
* | | | | Fix typo nbChannels -> channelMaskGlenn Kasten2013-11-222-2/+2
* | | | | am 2458681b: am 263c4310: am ce468a35: Stop wifi display discovery when no lo...Jeff Brown2013-11-211-27/+34
|\ \ \ \ \ | |/ / / /
| * | | | Stop wifi display discovery when no longer needed.Jeff Brown2013-11-211-27/+34