summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Synchronize channel masks in AudioFormat with system/audio.h"Glenn Kasten2014-03-311-1/+8
|\
| * Synchronize channel masks in AudioFormat with system/audio.hGlenn Kasten2014-03-281-1/+8
* | Merge "Fix typo"Glenn Kasten2014-03-311-4/+4
|\ \
| * | Fix typoGlenn Kasten2014-03-281-4/+4
| |/
* | am 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t param...Narayan Kamath2014-03-311-2/+2
|\ \ | |/ |/|
| * am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"Narayan Kamath2014-03-311-2/+2
| |\
| | * Merge "Cast CallMethod's size_t parameters to jint"Narayan Kamath2014-03-311-2/+2
| | |\
| | | * Cast CallMethod's size_t parameters to jintAshok Bhat2014-03-251-2/+2
* | | | Remove SkOmxPixelRef to fix build.Leon Scroggins2014-03-275-117/+0
* | | | Make setServer() safe to call multiple timesMarco Nelissen2014-03-271-2/+7
* | | | Merge "Continue refactoring MediaFocusControl"Jean-Michel Trivi2014-03-262-186/+186
|\ \ \ \
| * | | | Continue refactoring MediaFocusControlJean-Michel Trivi2014-03-252-186/+186
* | | | | Merge "Continue refactoring of MediaFocusControl"Jean-Michel Trivi2014-03-262-162/+226
|\ \ \ \ \ | |/ / / /
| * | | | Continue refactoring of MediaFocusControlJean-Michel Trivi2014-03-252-162/+226
* | | | | am 959bce3e: am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue"Mark Salyzyn2014-03-261-5/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue"Mark Salyzyn2014-03-261-5/+6
| |\ \ \ | | |/ /
| | * | jni: 64-bit compile issueMark Salyzyn2014-03-261-5/+6
| | |/
* | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |