summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Move MIDI utilities for internal use to com.android.internal.midi packageMike Lockwood2015-03-303-84/+4
* Merge "AudioService: Observe changes to output devices per-stream."John Spurlock2015-03-271-0/+28
|\
| * AudioService: Observe changes to output devices per-stream.John Spurlock2015-03-261-0/+28
* | Merge "Fix a few found doc problems."John Spurlock2015-03-272-5/+5
|\ \
| * | Fix a few found doc problems.John Spurlock2015-03-242-5/+5
| |/
* | Merge "AudioRecord builder"Jean-Michel Trivi2015-03-262-4/+169
|\ \
| * | AudioRecord builderJean-Michel Trivi2015-03-252-4/+169
* | | Added MediaDescription#getMediaUri.P.Y. Laligand2015-03-251-2/+30
* | | Added MediaController.TransportControls#playFromUri.P.Y. Laligand2015-03-255-6/+67
|/ /
* | Merge "Make TvInputService skip to dispatch media keys to an overlay view"Youngsang Cho2015-03-251-2/+10
|\ \ | |/ |/|
| * Make TvInputService skip to dispatch media keys to an overlay viewYoungsang Cho2015-03-251-2/+10
* | Remove the ability to disable audio service.John Spurlock2015-03-243-456/+227
* | Merge "TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract.Programs"Dongwon Kang2015-03-241-0/+44
|\ \
| * | TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract.ProgramsDongwon Kang2015-03-231-0/+44
* | | Merge "Note in docs that MediaDrm methods throw IllegalStateException"Jeff Tinker2015-03-241-1/+4
|\ \ \
| * | | Note in docs that MediaDrm methods throw IllegalStateExceptionJeff Tinker2015-03-131-1/+4
* | | | Merge "Report key request message type for unprefixed EME"Jeff Tinker2015-03-242-3/+59
|\ \ \ \
| * | | | Report key request message type for unprefixed EMEJeff Tinker2015-03-232-3/+59
* | | | | Merge "TIF: fix NPE in the case a hardware TV input is not ready to use."Dongwon Kang2015-03-231-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | TIF: fix NPE in the case a hardware TV input is not ready to use.Dongwon Kang2015-03-231-1/+2
| | |/ / | |/| |
* | | | Merge "media: fix build break"Zhijun He2015-03-231-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | media: fix build breakZhijun He2015-03-231-1/+1
* | | | camera2: Remove ProCamera.Ruben Brunk2015-03-201-26/+0
|/ / /
* | | ImageReader/Writer: Add ImageWriter and Opaque ImageReaderZhijun He2015-03-208-10/+2211
* | | Merge "Camera: update createStream API to add new rotation field"Yin-Chia Yeh2015-03-191-6/+10
|\ \ \
| * | | Camera: update createStream API to add new rotation fieldYin-Chia Yeh2015-03-161-6/+10
* | | | Merge "fix return from finally"Eric Laurent2015-03-194-8/+4
|\ \ \ \
| * | | | fix return from finallyEric Laurent2015-03-184-8/+4
* | | | | Merge "MidiDeviceInfo: Add constants for future Bluetooth MIDI support"Mike Lockwood2015-03-191-0/+12
|\ \ \ \ \
| * | | | | MidiDeviceInfo: Add constants for future Bluetooth MIDI supportMike Lockwood2015-03-191-0/+12
| |/ / / /
* | | | | Merge "TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract"Dongwon Kang2015-03-191-0/+44
|\ \ \ \ \
| * | | | | TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContractDongwon Kang2015-03-181-0/+44
* | | | | | Merge "TIF: Add TvInputInfo.isHardwareInput()."Dongwon Kang2015-03-191-8/+25
|\ \ \ \ \ \
| * | | | | | TIF: Add TvInputInfo.isHardwareInput().Dongwon Kang2015-03-121-8/+25
* | | | | | | TIF: Add a missing comment for the return value of onSelectTrack()Jae Seo2015-03-171-19/+21
* | | | | | | Merge "Revert "Revert "soundpool: update sample rate when reusing audiotrack"""Andy Hung2015-03-171-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Revert "Revert "soundpool: update sample rate when reusing audiotrack""Andy Hung2015-03-171-0/+2
* | | | | | | | Merge "Revert "Revert "soundpool: reuse channel for same sample if available"""Andy Hung2015-03-172-34/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Revert "soundpool: reuse channel for same sample if available""Andy Hung2015-03-172-34/+53
* | | | | | | | | Merge "Audio: Flag volume adjustments from hardware keys."John Spurlock2015-03-172-4/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Audio: Flag volume adjustments from hardware keys.John Spurlock2015-03-172-4/+11
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge "camera2: Release surface in ImageReader#close and fix legacy cleanup"Ruben Brunk2015-03-171-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | camera2: Release surface in ImageReader#close and fix legacy cleanupRuben Brunk2015-03-171-0/+1
* | | | | | | | | | Merge "Deprecate redundant event, should handle via NotProvisionedException"Jeff Tinker2015-03-171-0/+3
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Deprecate redundant event, should handle via NotProvisionedExceptionJeff Tinker2015-03-131-0/+3
* | | | | | | | | Merge "TIF: Add getDescription() method to TvTrackInfo."Dongwon Kang2015-03-161-6/+28
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | TIF: Add getDescription() method to TvTrackInfo.Dongwon Kang2015-03-111-6/+28
* | | | | | | | | MidiDeviceInfo: Fix NPE for devices with no port namesMike Lockwood2015-03-161-2/+10
* | | | | | | | | am c3228a9d: am 3d33314e: Merge "Frameworks/base: Use equals for Integer comp...Andreas Gampe2015-03-163-5/+7
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge "Frameworks/base: Use equals for Integer comparison"Andreas Gampe2015-03-163-5/+7
| |\ \ \ \ \ \ \ \ \