summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Expand)AuthorAgeFilesLines
* Merge "wifi-display: add certification options" into klp-devChong Zhang2013-08-231-3/+14
|\
| * wifi-display: add certification optionsChong Zhang2013-08-231-3/+14
* | Merge "Return EXIF thumbnails when available." into klp-devJeff Sharkey2013-08-231-0/+16
|\ \ | |/ |/|
| * Return EXIF thumbnails when available.Jeff Sharkey2013-08-231-0/+16
* | ImageReader: Fix API doc table misalignment issueZhijun He2013-08-231-5/+5
* | Merge "Add ability to test supported content types to MediaDrm" into klp-devJeff Tinker2013-08-221-2/+15
|\ \
| * | Add ability to test supported content types to MediaDrmJeff Tinker2013-08-211-2/+15
* | | Merge "Ratings for RemoteControl" into klp-devJean-Michel Trivi2013-08-226-2/+267
|\ \ \
| * | | Ratings for RemoteControlJean-Michel Trivi2013-08-226-2/+267
* | | | Updating Force Use toggling for Communication use caseJohan Gustavsson2013-08-211-2/+16
| |_|/ |/| |
* | | Merge "MediaPlayer: add listener for subtitle data" into klp-devChong Zhang2013-08-202-0/+129
|\ \ \
| * | | MediaPlayer: add listener for subtitle dataChong Zhang2013-08-162-0/+129
* | | | Merge "MediaPlayer.TrackInfo: add getFormat() method" into klp-devChong Zhang2013-08-201-4/+26
|\ \ \ \ | |/ / /
| * | | MediaPlayer.TrackInfo: add getFormat() methodLajos Molnar2013-08-151-4/+26
* | | | AudioSystem: new audioflinger restart detectionEric Laurent2013-08-192-49/+29
* | | | Merge changes Id3815fe8,I90a85921 into klp-devJeff Brown2013-08-194-41/+22
|\ \ \ \ | |_|/ / |/| | |
| * | | Define AudioSource.REMOTE_SUBMIX.Jeff Brown2013-08-191-1/+22
| * | | Remove setRemoteSubmixOn method.Jeff Brown2013-08-163-40/+0
* | | | Merge "Expose KEY_REPEAT_PREVIOUS_FRAME_AFTER and KEY_PUSH_BLANK_BUFFERS_ON_S...Andreas Huber2013-08-191-0/+20
|\ \ \ \
| * | | | Expose KEY_REPEAT_PREVIOUS_FRAME_AFTER and KEY_PUSH_BLANK_BUFFERS_ON_STOPAndreas Huber2013-08-141-0/+20
* | | | | Merge "Adding support for Absolute Volume" into klp-devMatthew Xie2013-08-183-19/+121
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Adding support for Absolute VolumeJohn Du2013-08-163-19/+121
| | |_|/ | |/| |
* | | | Merge "media: Fix ImageReader only using maxImages=1 no matter what" into klp...Igor Murashkin2013-08-161-6/+23
|\ \ \ \ | |_|_|/ |/| | |
| * | | media: Fix ImageReader only using maxImages=1 no matter whatIgor Murashkin2013-08-161-6/+23
| |/ /
* | | MediaFormat: added subtitle formatLajos Molnar2013-08-151-1/+29
|/ /
* | Merge "Expose MediaCodec.setParameters API to" into klp-devAndreas Huber2013-08-141-0/+46
|\ \
| * | Expose MediaCodec.setParameters API toAndreas Huber2013-08-121-0/+46
| |/
* | MediaCodecInfo.java: Added isFeatureSupported method to CodecCapabilitiesLajos Molnar2013-08-131-1/+20
|/
* am 53d86f6e: am f5cfe708: am e8acd367: Merge "When deleting a db file, Contex...Marco Nelissen2013-08-081-1/+1
|\
| * Merge "When deleting a db file, Context.deleteDatabase() has to be called ins...Marco Nelissen2013-08-071-1/+1
| |\
| | * When deleting a db file,jangwon.lee2013-07-311-1/+1
* | | Merge "Update audio comments"Glenn Kasten2013-08-072-6/+8
|\ \ \
| * | | Update audio commentsGlenn Kasten2013-08-062-6/+8
* | | | Merge "Define error codes for MediaCodec.CryptoException"Jeff Tinker2013-08-073-0/+47
|\ \ \ \
| * | | | Define error codes for MediaCodec.CryptoExceptionJeff Tinker2013-08-033-0/+47
* | | | | Event handler should be private in MediaFocusControlJean-Michel Trivi2013-08-061-1/+1
* | | | | Merge "Reorder and comment MediaFocusControl code"Jean-Michel Trivi2013-08-061-29/+33
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Reorder and comment MediaFocusControl codeJean-Michel Trivi2013-08-061-29/+33
* | | | | ImageReader: Add RGB format support.Zhijun He2013-08-061-2/+14
* | | | | Merge "Don't doubly initialize fields in constructor"Glenn Kasten2013-08-051-5/+4
|\ \ \ \ \
| * | | | | Don't doubly initialize fields in constructorGlenn Kasten2013-08-021-5/+4
| |/ / / /
* | | | | Merge "Clean up imports"Glenn Kasten2013-08-051-2/+0
|\ \ \ \ \
| * | | | | Clean up importsGlenn Kasten2013-08-021-2/+0
| |/ / / /
* | | | | Merge "Clean up throws in AudioRecord and AudioTrack"Glenn Kasten2013-08-052-32/+19
|\ \ \ \ \
| * | | | | Clean up throws in AudioRecord and AudioTrackGlenn Kasten2013-08-022-32/+19
| |/ / / /
* | | | | am b56f10aa: am 32c308a5: Merge "If media wants ASCII lowercasing, it needs t...Elliott Hughes2013-08-022-4/+5
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | If media wants ASCII lowercasing, it needs to ask for it.Elliott Hughes2013-08-022-4/+5
* | | | Remove whitespace in IAudioService.aidlJean-Michel Trivi2013-08-011-10/+10
* | | | Remove outdated comment in MediaFocusControlJean-Michel Trivi2013-08-011-3/+0
* | | | Unhide android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVEJean-Michel Trivi2013-08-011-2/+3