summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 504752fb: Merge "Ensure MediaBrowser state is set to connecting after a re...RoboErik2014-09-251-0/+1
|\
| * Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into...RoboErik2014-09-251-0/+1
| |\
| | * Ensure MediaBrowser state is set to connecting after a reconnectRoboErik2014-09-241-0/+1
* | | am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-devRoboErik2014-09-252-2/+3
|\ \ \ | |/ /
| * | Merge "Allow null queues to be set in MediaSession" into lmp-devRoboErik2014-09-252-2/+3
| |\ \ | | |/
| | * Allow null queues to be set in MediaSessionRoboErik2014-09-242-2/+3
* | | am ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-devRonghua Wu2014-09-251-1/+1
|\ \ \ | |/ /
| * | Merge "MediaCodecList: fix findEncoderForFormat." into lmp-devRonghua Wu2014-09-251-1/+1
| |\ \
| | * | MediaCodecList: fix findEncoderForFormat.Ronghua Wu2014-09-251-1/+1
| | |/
* | | am 4e43a27a: Merge "MediaCodec: revalidate cached queued input buffers if que...Lajos Molnar2014-09-251-5/+17
|\ \ \ | |/ /
| * | MediaCodec: revalidate cached queued input buffers if queue fails (2)Lajos Molnar2014-09-241-5/+17
* | | am aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if que...Lajos Molnar2014-09-241-4/+14
|\ \ \ | |/ /
| * | Merge "MediaCodec: revalidate cached queued input buffers if queue fails" int...Lajos Molnar2014-09-241-4/+14
| |\ \
| | * | MediaCodec: revalidate cached queued input buffers if queue failsLajos Molnar2014-09-241-4/+14
* | | | am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-devRuben Brunk2014-09-242-19/+49
|\ \ \ \ | |/ / /
| * | | Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-devRuben Brunk2014-09-242-19/+49
| |\ \ \ | | |/ / | |/| |
| | * | camera2: Hide JPEGs in RGBA gralloc buffers.Ruben Brunk2014-09-242-19/+49
| | |/
* | | am e9858c6a: Merge "camera2: Update CamcorderProfile documentation." into lmp...Ruben Brunk2014-09-241-0/+36
|\ \ \ | |/ /
| * | Merge "camera2: Update CamcorderProfile documentation." into lmp-devRuben Brunk2014-09-241-0/+36
| |\ \ | | |/ | |/|
| | * camera2: Update CamcorderProfile documentation.Ruben Brunk2014-09-241-0/+36
* | | am 337f4b98: am ee99d080: Merge "AudioRecord: add HW hotword capture flag" in...Eric Laurent2014-09-241-1/+10
|\ \ \ | |/ /
| * | Merge "AudioRecord: add HW hotword capture flag" into lmp-devEric Laurent2014-09-241-1/+10
| |\ \
| | * | AudioRecord: add HW hotword capture flagEric Laurent2014-09-191-1/+10
| | |/
* | | am c3ae3aea: am 3eeac344: Merge "Implement API review feedback." into lmp-devJeff Tinker2014-09-232-7/+10
|\ \ \ | |/ /
| * | Merge "Implement API review feedback." into lmp-devJeff Tinker2014-09-232-7/+10
| |\ \
| | * | Implement API review feedback.Jeff Tinker2014-09-232-7/+10
| | |/
* | | am c647e050: am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" i...Christoph Studer2014-09-231-0/+8
|\ \ \ | |/ /
| * | SysUI: Correctly compare MediaControllersChristoph Studer2014-09-191-0/+8
| |/
* | resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aospDan Albert2014-09-191-1/+3
|\ \ | |/ |/|
| * Clean up makefile cruft.Dan Albert2014-09-111-1/+3
| * android_media_MediaMuxer_setLocation: amended signature.Robert Shih2014-09-041-1/+1
* | Adjust volume bar visibility in HDMI-CEC system audio modeJungshik Jang2014-09-171-0/+10
* | Add new DisconnectCause class to telecomm.Andrew Lee2014-09-161-0/+6
* | Fix volume change failure in HDMI-CEC system audio mode.Jungshik Jang2014-09-161-0/+10
* | Merge "Document retry behavior for MediaCodec.CryptoException" into lmp-devJeff Tinker2014-09-151-3/+6
|\ \
| * | Document retry behavior for MediaCodec.CryptoExceptionJeff Tinker2014-09-151-3/+6
* | | TIF: Turn debugging offJae Seo2014-09-142-4/+2
* | | Renaming Telecomm to Telecom.Tyler Gunn2014-09-121-5/+4
* | | Merge "more AudioAttributes javadoc" into lmp-devJean-Michel Trivi2014-09-121-3/+53
|\ \ \
| * | | more AudioAttributes javadocJean-Michel Trivi2014-09-121-3/+53
* | | | TIF: Add a system API to retrieve HDMI device informationJae Seo2014-09-121-8/+26
* | | | AudioService: modify stream delay for touch explorationJean-Michel Trivi2014-09-121-9/+48
|/ / /
* | | Change callback methods from add to register.Michael Wright2014-09-113-8/+8
* | | Merge "More android.media.AudioFormat.Builder javadoc" into lmp-devJean-Michel Trivi2014-09-111-2/+13
|\ \ \
| * | | More android.media.AudioFormat.Builder javadocJean-Michel Trivi2014-09-091-2/+13
* | | | Fix build breakageYoungsang Cho2014-09-111-2/+2
* | | | Merge "Add a system API to query hdmi system audio mode" into lmp-devTerry Heo2014-09-113-1/+24
|\ \ \ \
| * | | | Add a system API to query hdmi system audio modeTerry Heo2014-09-043-1/+24
* | | | | Notify of the update of TvInputInfoChulwoo Lee2014-09-112-0/+31
* | | | | MediaCodec.Image: use image.setCrop() in constructorLajos Molnar2014-09-101-1/+1