summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Frameworks/base: Use equals for Integer comparisonAndreas Gampe2015-03-153-5/+7
* | | | | | | | | | Merge "media: add MediaFormat.KEY_PRIORITY."Ronghua Wu2015-03-161-0/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | media: add MediaFormat.KEY_PRIORITY.Ronghua Wu2015-03-141-0/+19
* | | | | | | | | | | Merge "Add MidiManager to public API"Mike Lockwood2015-03-149-76/+60
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add MidiManager to public APIMike Lockwood2015-03-139-76/+60
* | | | | | | | | | | am 0d22633e: am 62632e25: Merge "Handle NULL keys and NULL values in MediaDrm...Jeff Tinker2015-03-131-4/+16
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap"Jeff Tinker2015-03-131-4/+16
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Handle NULL keys and NULL values in MediaDrm JNI HashMapDaniel Broms2014-11-241-4/+16
* | | | | | | | | | | Merge "VolumePolicy: Debounce adjustments from vibrate->silent."John Spurlock2015-03-131-4/+19
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | VolumePolicy: Debounce adjustments from vibrate->silent.John Spurlock2015-03-131-4/+19
* | | | | | | | | | | Merge "MidiDeviceInfo meta-data improvements:"Mike Lockwood2015-03-133-13/+108
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | MidiDeviceInfo meta-data improvements:Mike Lockwood2015-03-123-13/+108
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | AudioService: Define minimum levels for volume streams.John Spurlock2015-03-132-0/+20
* | | | | | | | | Merge "Volume policy updates."John Spurlock2015-03-135-5/+108
|\ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-06-03 18:14:37 +0000