summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Continue refactoring of MediaFocusControlJean-Michel Trivi2014-03-252-11/+17
* Begin refactor of MediaFocusControlJean-Michel Trivi2014-03-252-386/+440
* Merge "AudioTrack write from ByteBuffer updates position"Jean-Michel Trivi2014-03-211-17/+15
|\
| * AudioTrack write from ByteBuffer updates positionJean-Michel Trivi2014-03-211-17/+15
* | MediaHTTPConnection: fix JNI signatureColin Cross2014-03-201-1/+1
* | MediaHTTPConnection: use jlong to store native pointerColin Cross2014-03-192-4/+4
* | Merge "Add stream-level suppression to vibrate/audio services."John Spurlock2014-03-196-15/+157
|\ \
| * | Add stream-level suppression to vibrate/audio services.John Spurlock2014-03-196-15/+157
| |/
* | am a0e300ef: am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor should...Glenn Kasten2014-03-191-1/+0
|\ \ | |/ |/|
| * am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."Glenn Kasten2014-03-191-1/+0
| |\
| | * mediaeditor shouldn't depend on audioflinger.Narayan Kamath2014-03-191-1/+0
| * | am e128ca43: am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow i...Lajos Molnar2014-03-191-1/+1
| |\ \
| | * \ am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in Media...Lajos Molnar2014-03-191-1/+1
| | |\ \
| | | * | MediaPlayer: fix int overflow issue in MediaTimeProviderLajos Molnar2014-03-191-1/+1
| * | | | am f8d8777d: Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-171-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-171-2/+2
| * | | | am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
| |\ \ \ \ | | |/ / /
| | * | | am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
| | |\ \ \ | | | |/ /
| | | * | Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
| | | |\ \
| | | | * | Verify certificatesMarco Nelissen2014-03-132-0/+46
| * | | | | am 57080be9: am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVo...Zhihai Xu2014-03-141-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passe...Zhihai Xu2014-03-141-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from Audio...Zhihai Xu2014-03-121-1/+1
| | | * | | Fix a JNI local reference leak in JNIMediaPlayerListener::notify.Elliott Hughes2014-03-071-0/+1
| * | | | | am 34425196: am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif in...Marco Nelissen2014-03-072-34/+46
| |\ \ \ \ \ | | |/ / / /
| | * | | | am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libj...Marco Nelissen2014-03-072-34/+46
| | |\ \ \ \ | | | |/ / /
| | | * | | Make MtpDatabase use libexif instead of libjheadMarco Nelissen2014-03-072-34/+46
| | | |/ /
* | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-171-11/+13
|\ \ \ \ \
| * | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-121-11/+13
* | | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-171-3/+5
|\ \ \ \ \ \
| * | | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-121-3/+5
| |/ / / / /
* | | | | | MTP: Add support for some audio specific object propertiesMike Lockwood2014-03-132-0/+38
* | | | | | Merge "Adds a TransportController and TransportPerformer to session"RoboErik2014-03-1215-209/+2380
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Adds a TransportController and TransportPerformer to sessionRoboErik2014-03-1215-209/+2380
* | | | | | Merge "MTP: Add support for battery level device property"Mike Lockwood2014-03-124-58/+147
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | MTP: Add support for battery level device propertyMike Lockwood2014-03-124-58/+147
* | | | | | Merge "AudioTrack write method with data in ByteBuffer"Jean-Michel Trivi2014-03-111-2/+103
|\ \ \ \ \ \
| * | | | | | AudioTrack write method with data in ByteBufferJean-Michel Trivi2014-03-111-2/+103
* | | | | | | MediaPlayer: fix int overflow issue in MediaTimeProviderLajos Molnar2014-03-101-1/+1
* | | | | | | Merge "MediaMuxer: added WebM filetype; open output file RW."Robert Shih2014-03-101-10/+11
|\ \ \ \ \ \ \
| * | | | | | | MediaMuxer: added WebM filetype; open output file RW.Robert Shih2014-01-291-10/+11
* | | | | | | | am f7a6fe95: am 0425a51b: am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that...Narayan Kamath2014-03-071-3/+3
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"Narayan Kamath2014-03-071-3/+3
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge "Don't assume that size_t is 32-bit"Narayan Kamath2014-03-071-3/+3
| | |\ \ \ \ \ \
| | | * | | | | | Don't assume that size_t is 32-bitAshok Bhat2014-03-061-3/+3
* | | | | | | | | am f2c11c14: am 214c3d9b: am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t ...Narayan Kamath2014-03-071-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store u...Narayan Kamath2014-03-071-3/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Don't use size_t for variables that store uint32_t valueAshok Bhat2014-03-061-3/+3
| | |/ / / / /
| * | | | | | am b2c45abc: am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load f...Marco Nelissen2014-03-071-1/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into ...Marco Nelissen2014-03-071-1/+1
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |