summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
| * | am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
| |\ \
| | * \ am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
| | |\ \
| | | * | Remove unused LOCAL_LDLIBS.Ying Wang2014-05-071-2/+0
* | | | | Fix javadoc reference in AudioTrack write modesJean-Michel Trivi2014-05-081-2/+2
* | | | | Merge "Unhide AudioTrack.write() method for non-blocking and ByteBuffer"Jean-Michel Trivi2014-05-081-3/+0
|\ \ \ \ \
| * | | | | Unhide AudioTrack.write() method for non-blocking and ByteBufferJean-Michel Trivi2014-05-071-3/+0
* | | | | | Fix buildSelim Gurun2014-05-071-2/+2
|/ / / / /
* | | | | Merge "Add a class for managing Session priority"RoboErik2014-05-073-52/+57
|\ \ \ \ \
| * | | | | Add a class for managing Session priorityRoboErik2014-05-063-52/+57
* | | | | | Merge "Add APIs for creating a system priority session and getting controllers"RoboErik2014-05-075-12/+61
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add APIs for creating a system priority session and getting controllersRoboErik2014-05-065-12/+61
| | |_|_|/ | |/| | |
* | | | | Add AudioFormat.ENCODING_PCM_FLOATGlenn Kasten2014-05-061-1/+3
* | | | | Add AudioFormat.getBytesPerSample and use itGlenn Kasten2014-05-064-4/+21
|/ / / /
* | | | Merge "Add playback state and metadata to dump"RoboErik2014-05-022-0/+23
|\ \ \ \
| * | | | Add playback state and metadata to dumpRoboErik2014-05-012-0/+23
* | | | | Merge "MediaHTTPConnection: support header android-allow-cross-domain-redirect"Lajos Molnar2014-05-021-12/+97
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | MediaHTTPConnection: support header android-allow-cross-domain-redirectLajos Molnar2014-04-291-12/+97
* | | | | Fix sdk buildRoboErik2014-05-011-2/+1
* | | | | Merge "Bounds Check in onPlaySoundEffect"Natalie Silvanovich2014-05-011-0/+5
|\ \ \ \ \
| * | | | | Bounds Check in onPlaySoundEffectNatalie Silvanovich2014-05-011-0/+5
* | | | | | Merge "Add Session API calls to RCC and AudioManager"RoboErik2014-05-017-73/+598
|\ \ \ \ \ \
| * | | | | | Add Session API calls to RCC and AudioManagerRoboErik2014-05-017-73/+598
* | | | | | | Merge "Add dump to MediaSessionService"RoboErik2014-05-012-0/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add dump to MediaSessionServiceRoboErik2014-04-292-0/+18
| |/ / / / /
* | | | | | am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null p...Marco Nelissen2014-05-011-0/+7
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avo...Marco Nelissen2014-05-011-0/+7
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone ...Marco Nelissen2014-05-011-0/+7
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."Marco Nelissen2014-05-011-0/+7
| | | |\ \ \
| | | | * | | MetadataRetriever: Check null pointer to avoid tombstone crash.wang, biao2014-04-091-0/+7
* | | | | | | Merge "Fix MediaFocusControl index management for PlayerRecord"Jean-Michel Trivi2014-04-301-7/+13
|\ \ \ \ \ \ \
| * | | | | | | Fix MediaFocusControl index management for PlayerRecordJean-Michel Trivi2014-04-301-7/+13
* | | | | | | | am 21ccb07f: am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t p...Narayan Kamath2014-04-301-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to ...Narayan Kamath2014-04-301-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"Narayan Kamath2014-04-301-1/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge "Cast CallVoidMethod's size_t parameters to jint"Narayan Kamath2014-04-301-1/+1
| | | |\ \ \ \
| | | | * | | | Cast CallVoidMethod's size_t parameters to jintAshok Bhat2014-03-061-1/+1
| | * | | | | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-299-72/+131
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."Glenn Kasten2014-03-191-1/+0
| | | |\ \ \ \ \
| | | * \ \ \ \ \ am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in Media...Lajos Molnar2014-03-191-1/+1
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passe...Zhihai Xu2014-03-141-1/+1
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"Narayan Kamath2014-03-111-3/+3
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store u...Narayan Kamath2014-03-111-3/+3
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libj...Marco Nelissen2014-03-082-34/+46
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into ...Marco Nelissen2014-03-071-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-devMarco Nelissen2014-03-071-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into kl...Leon Scroggins III2014-03-071-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aospLeon Scroggins III2014-03-061-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"Narayan Kamath2014-03-071-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | / / / / | | | | | |_|_|_|_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acqui...Zhijun He2014-03-071-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \