summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-devMarco Nelissen2014-03-202-0/+45
|\
| * resolved conflicts for merge of c53ad4cd to jb-mr2-devMarco Nelissen2014-03-202-0/+45
| |\
| | * am 072e1da2: am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved con...Marco Nelissen2014-03-202-0/+45
| | |\
| | | * am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-devMarco Nelissen2014-03-202-0/+45
| | | |\
| | | | * resolved conflicts for merge of 534f3e94 to jb-mr1-devMarco Nelissen2014-03-202-0/+45
| | | | |\
| | | | | * am a3337bc7: Merge "Verify certificates" into jb-devMarco Nelissen2014-03-202-0/+45
| | | | | |\
| | | | | | * Verify certificatesMarco Nelissen2014-03-172-0/+45
| | * | | | | am 0412d9c7: am 4d17834a: am b83e8b69: am 292c979a: am d440ca76: am f3a5323c:...Nick Kralevich2013-04-292-7/+43
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
| | | | |\ \ \ | | | | | |/ /
| | | | | * | am 6d8f5b75: libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
| | | | | |\ \ | | | | | | |/
| | | | | | * libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
* | | | | | | am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo...David Friedman2013-09-271-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file.David Friedman2013-09-271-1/+1
* | | | | | | Add option for video playback test to accept media source path.Xia Wang2013-07-112-14/+23
|/ / / / / /
* | | | | | Expose latency methods through AudioManager and AudioTrack.Oliver Woodman2013-07-013-0/+26
* | | | | | additional documentation for media codec infoScott Main2013-06-142-3/+38
* | | | | | Merge "Let RemoteControlDisplay know more about playback position" into jb-mr...Zhihai Xu2013-06-112-2/+52
|\ \ \ \ \ \
| * | | | | | Let RemoteControlDisplay know more about playback positionJean-Michel Trivi2013-06-072-2/+52
* | | | | | | Unhide MediaExtractor.getPsshInfo()Marco Nelissen2013-06-101-2/+2
|/ / / / / /
* | | | | | javadoc cleanup for audioeffectScott Main2013-06-031-7/+25
* | | | | | Listen for HTTP proxy changes and propagate the information to the mediaAndreas Huber2013-05-312-3/+139
* | | | | | Merge "MediaMuxer sample code update, no functional change" into jb-mr2-devztenghui2013-05-311-8/+17
|\ \ \ \ \ \
| * | | | | | MediaMuxer sample code update, no functional changeztenghui2013-05-311-8/+17
* | | | | | | Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-devJeff Brown2013-05-311-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.Jeff Brown2013-05-301-5/+5
* | | | | | | Merge "Monitor device rotation" into jb-mr2-devJean-Michel Trivi2013-05-301-6/+50
|\ \ \ \ \ \ \
| * | | | | | | Monitor device rotationJean-Michel Trivi2013-05-281-6/+50
* | | | | | | | Merge "Refactor of camera stress test to add camera test helper. Also add add...Jason Noguchi2013-05-306-197/+995
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Refactor of camera stress test to add camera test helper. Also addJason Noguchi2013-05-286-197/+995
* | | | | | | | Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-devLajos Molnar2013-05-291-11/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | android.media.MediaMuxer: remove SAMPLE_SYNC_FLAGLajos Molnar2013-05-291-11/+4
* | | | | | | | Merge "Update test with CamercorderProfile video size." into jb-mr2-devYu Shan Emily Lau2013-05-251-16/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Update test with CamercorderProfile video size.Yu Shan Emily Lau2013-05-231-16/+15
* | | | | | | | Merge "Improve exception error messages to help diagnose app errors" into jb-...Jeff Tinker2013-05-221-32/+70
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve exception error messages to help diagnose app errorsJeff Tinker2013-05-211-32/+70
* | | | | | | | | Fix invalid keyType translation in MediaDrm.getKeyRequestJeff Tinker2013-05-211-5/+29
|/ / / / / / / /
* | | | | | | | Add route description API.Jeff Brown2013-05-161-7/+55
|/ / / / / / /
* | | | | | | Merge "Add an API to determine if a route is connecting." into jb-mr2-devJeff Brown2013-05-101-1/+13
|\ \ \ \ \ \ \
| * | | | | | | Add an API to determine if a route is connecting.Jeff Brown2013-05-091-1/+13
* | | | | | | | Fix buildMarco Nelissen2013-05-101-0/+5
* | | | | | | | Merge "Fix build" into jb-mr2-devMarco Nelissen2013-05-101-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix buildMarco Nelissen2013-05-101-0/+5
* | | | | | | | Add an API to allow a callback to request active scans.Jeff Brown2013-05-091-28/+143
* | | | | | | | Fix bug managing wifi display routes.Jeff Brown2013-05-091-13/+9
|/ / / / / / /
* | | | | | | Correct java API docs for MediaDrm offline use caseJeff Tinker2013-05-071-5/+10
|/ / / / / /
* | | | | | Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into ...Jeff Tinker2013-05-016-17/+120
|\ \ \ \ \ \
| * | | | | | MediaDrm API: Add two exceptions to handle error path scenariosJeff Tinker2013-04-306-17/+120
* | | | | | | Merge "Fix a crash case" into jb-mr2-devMike J. Chen2013-05-011-5/+6
|\ \ \ \ \ \ \
| * | | | | | | Fix a crash caseMike J. Chen2013-04-261-5/+6
| |/ / / / / /