Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev | Marco Nelissen | 2014-03-20 | 2 | -0/+45 |
|\ | |||||
| * | resolved conflicts for merge of c53ad4cd to jb-mr2-dev | Marco Nelissen | 2014-03-20 | 2 | -0/+45 |
| |\ | |||||
| | * | am 072e1da2: am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved con... | Marco Nelissen | 2014-03-20 | 2 | -0/+45 |
| | |\ | |||||
| | | * | am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev | Marco Nelissen | 2014-03-20 | 2 | -0/+45 |
| | | |\ | |||||
| | | | * | resolved conflicts for merge of 534f3e94 to jb-mr1-dev | Marco Nelissen | 2014-03-20 | 2 | -0/+45 |
| | | | |\ | |||||
| | | | | * | am a3337bc7: Merge "Verify certificates" into jb-dev | Marco Nelissen | 2014-03-20 | 2 | -0/+45 |
| | | | | |\ | |||||
| | | | | | * | Verify certificates | Marco Nelissen | 2014-03-17 | 2 | -0/+45 |
| | * | | | | | am 0412d9c7: am 4d17834a: am b83e8b69: am 292c979a: am d440ca76: am f3a5323c:... | Nick Kralevich | 2013-04-29 | 2 | -7/+43 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | am d440ca76: am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls | Nick Kralevich | 2013-04-29 | 2 | -7/+43 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | am f3a5323c: am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls | Nick Kralevich | 2013-04-29 | 2 | -7/+43 |
| | | | |\ \ \ | | | | | |/ / | |||||
| | | | | * | | am 6d8f5b75: libdrm: fix bad strncpy / snprintf calls | Nick Kralevich | 2013-04-29 | 2 | -7/+43 |
| | | | | |\ \ | | | | | | |/ | |||||
| | | | | | * | libdrm: fix bad strncpy / snprintf calls | Nick Kralevich | 2013-04-29 | 2 | -7/+43 |
* | | | | | | | am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo... | David Friedman | 2013-09-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. | David Friedman | 2013-09-27 | 1 | -1/+1 |
* | | | | | | | Add option for video playback test to accept media source path. | Xia Wang | 2013-07-11 | 2 | -14/+23 |
|/ / / / / / | |||||
* | | | | | | Expose latency methods through AudioManager and AudioTrack. | Oliver Woodman | 2013-07-01 | 3 | -0/+26 |
* | | | | | | additional documentation for media codec info | Scott Main | 2013-06-14 | 2 | -3/+38 |
* | | | | | | Merge "Let RemoteControlDisplay know more about playback position" into jb-mr... | Zhihai Xu | 2013-06-11 | 2 | -2/+52 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Let RemoteControlDisplay know more about playback position | Jean-Michel Trivi | 2013-06-07 | 2 | -2/+52 |
* | | | | | | | Unhide MediaExtractor.getPsshInfo() | Marco Nelissen | 2013-06-10 | 1 | -2/+2 |
|/ / / / / / | |||||
* | | | | | | javadoc cleanup for audioeffect | Scott Main | 2013-06-03 | 1 | -7/+25 |
* | | | | | | Listen for HTTP proxy changes and propagate the information to the media | Andreas Huber | 2013-05-31 | 2 | -3/+139 |
* | | | | | | Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev | ztenghui | 2013-05-31 | 1 | -8/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | MediaMuxer sample code update, no functional change | ztenghui | 2013-05-31 | 1 | -8/+17 |
* | | | | | | | Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev | Jeff Brown | 2013-05-31 | 1 | -5/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity. | Jeff Brown | 2013-05-30 | 1 | -5/+5 |
* | | | | | | | Merge "Monitor device rotation" into jb-mr2-dev | Jean-Michel Trivi | 2013-05-30 | 1 | -6/+50 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Monitor device rotation | Jean-Michel Trivi | 2013-05-28 | 1 | -6/+50 |
* | | | | | | | | Merge "Refactor of camera stress test to add camera test helper. Also add add... | Jason Noguchi | 2013-05-30 | 6 | -197/+995 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Refactor of camera stress test to add camera test helper. Also add | Jason Noguchi | 2013-05-28 | 6 | -197/+995 |
* | | | | | | | | Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev | Lajos Molnar | 2013-05-29 | 1 | -11/+4 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG | Lajos Molnar | 2013-05-29 | 1 | -11/+4 |
* | | | | | | | | Merge "Update test with CamercorderProfile video size." into jb-mr2-dev | Yu Shan Emily Lau | 2013-05-25 | 1 | -16/+15 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Update test with CamercorderProfile video size. | Yu Shan Emily Lau | 2013-05-23 | 1 | -16/+15 |
* | | | | | | | | Merge "Improve exception error messages to help diagnose app errors" into jb-... | Jeff Tinker | 2013-05-22 | 1 | -32/+70 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Improve exception error messages to help diagnose app errors | Jeff Tinker | 2013-05-21 | 1 | -32/+70 |
* | | | | | | | | | Fix invalid keyType translation in MediaDrm.getKeyRequest | Jeff Tinker | 2013-05-21 | 1 | -5/+29 |
|/ / / / / / / / | |||||
* | | | | | | | | Add route description API. | Jeff Brown | 2013-05-16 | 1 | -7/+55 |
|/ / / / / / / | |||||
* | | | | | | | Merge "Add an API to determine if a route is connecting." into jb-mr2-dev | Jeff Brown | 2013-05-10 | 1 | -1/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add an API to determine if a route is connecting. | Jeff Brown | 2013-05-09 | 1 | -1/+13 |
* | | | | | | | | Fix build | Marco Nelissen | 2013-05-10 | 1 | -0/+5 |
* | | | | | | | | Merge "Fix build" into jb-mr2-dev | Marco Nelissen | 2013-05-10 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix build | Marco Nelissen | 2013-05-10 | 1 | -0/+5 |
* | | | | | | | | Add an API to allow a callback to request active scans. | Jeff Brown | 2013-05-09 | 1 | -28/+143 |
* | | | | | | | | Fix bug managing wifi display routes. | Jeff Brown | 2013-05-09 | 1 | -13/+9 |
|/ / / / / / / | |||||
* | | | | | | | Correct java API docs for MediaDrm offline use case | Jeff Tinker | 2013-05-07 | 1 | -5/+10 |
|/ / / / / / | |||||
* | | | | | | Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into ... | Jeff Tinker | 2013-05-01 | 6 | -17/+120 |
|\ \ \ \ \ \ | |||||
| * | | | | | | MediaDrm API: Add two exceptions to handle error path scenarios | Jeff Tinker | 2013-04-30 | 6 | -17/+120 |
* | | | | | | | Merge "Fix a crash case" into jb-mr2-dev | Mike J. Chen | 2013-05-01 | 1 | -5/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix a crash case | Mike J. Chen | 2013-04-26 | 1 | -5/+6 |
| |/ / / / / / |