summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "AudioTrack in SoundPool uses audio_attributes_t parameter" into mnc-devJean-Michel Trivi2015-05-141-2/+6
|\
| * AudioTrack in SoundPool uses audio_attributes_t parameterJean-Michel Trivi2015-05-131-2/+6
* | Merge "Add getChannelIndexMasks API to AudioDeviceInfo" into mnc-devAndy Hung2015-05-141-9/+25
|\ \
| * | Add getChannelIndexMasks API to AudioDeviceInfoAndy Hung2015-05-131-9/+25
* | | TIF: Add DVB device handling to TvInputManagerServiceJaesung Chung2015-05-144-0/+182
| |/ |/|
* | Merge "MediaPlayer/TimedMetaData: API updates related to timed metadata" into...Robert Shih2015-05-132-22/+29
|\ \
| * | MediaPlayer/TimedMetaData: API updates related to timed metadataRobert Shih2015-05-132-22/+29
* | | Merge "media: rename MediaCodec.setSurface to setOutputSurface" into mnc-devLajos Molnar2015-05-131-1/+1
|\ \ \
| * | | media: rename MediaCodec.setSurface to setOutputSurfaceLajos Molnar2015-05-131-1/+1
* | | | Merge "TIF: API Review: android.media.tv" into mnc-devJae Seo2015-05-134-37/+40
|\ \ \ \ | |/ / / |/| | |
| * | | TIF: API Review: android.media.tvJae Seo2015-05-124-37/+40
* | | | Merge "MediaCodec: rename usePersistentInputSurface to setInputSurface" into ...Chong Zhang2015-05-136-21/+21
|\ \ \ \
| * | | | MediaCodec: rename usePersistentInputSurface to setInputSurfaceChong Zhang2015-05-136-21/+21
* | | | | Merge "API Council Change Phase 2 - add/remove callback" into mnc-devPaul McLean2015-05-132-45/+113
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | API Council Change Phase 2 - add/remove callbackPaul McLean2015-05-132-45/+113
* | | | | Merge "Spell out parameters" into mnc-devGlenn Kasten2015-05-121-5/+5
|\ \ \ \ \
| * | | | | Spell out parametersGlenn Kasten2015-05-121-5/+5
* | | | | | Merge "MidiManager: Address API Council feedback:" into mnc-devMike Lockwood2015-05-1213-117/+157
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | MidiManager: Address API Council feedback:Mike Lockwood2015-05-1213-117/+157
* | | | | | Merge "Zen: Ringer mode integration fixes." into mnc-devJohn Spurlock2015-05-121-0/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Zen: Ringer mode integration fixes.John Spurlock2015-05-121-0/+4
| |/ / / /
* | | | | Merge "MediaSync: rename bufferIndex to bufferId." into mnc-devWei Jia2015-05-121-17/+19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | MediaSync: rename bufferIndex to bufferId.Wei Jia2015-05-121-17/+19
* | | | | Merge "TIF: Rename requestUnblockContent to unblockContent" into mnc-devJae Seo2015-05-125-9/+25
|\ \ \ \ \
| * | | | | TIF: Rename requestUnblockContent to unblockContentJae Seo2015-05-115-9/+25
* | | | | | Merge "TIF: add more documentation on Session.setOverlayViewEnabled()." into ...Dongwon Kang2015-05-121-2/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | TIF: add more documentation on Session.setOverlayViewEnabled().Dongwon Kang2015-05-111-2/+9
* | | | | | TIF: Unhide the surface layout APIJae Seo2015-05-112-28/+25
| |_|_|_|/ |/| | | |
* | | | | AudioRecord.Builder works with no or partial parametersJean-Michel Trivi2015-05-111-2/+18
| |/ / / |/| | |
* | | | Merge "android.media.AudioRecord.Builder: no "capture preset"" into mnc-devJean-Michel Trivi2015-05-112-17/+17
|\ \ \ \ | |_|/ / |/| | |
| * | | android.media.AudioRecord.Builder: no "capture preset"Jean-Michel Trivi2015-05-092-17/+17
* | | | Merge "Changes as per API council review." into mnc-devPaul McLean2015-05-118-371/+270
|\ \ \ \ | |_|/ / |/| | |
| * | | Changes as per API council review.Paul McLean2015-05-088-371/+270
* | | | Merge "MediaSync: address API review." into mnc-devWei Jia2015-05-0812-283/+277
|\ \ \ \
| * | | | MediaSync: address API review.Wei Jia2015-05-0812-283/+277
| |/ / /
* | | | Merge "media: merge CodecException's getErrorCode and getReason." into mnc-devRonghua Wu2015-05-082-37/+35
|\ \ \ \ | |_|/ / |/| | |
| * | | media: merge CodecException's getErrorCode and getReason.Ronghua Wu2015-05-082-37/+35
| | |/ | |/|
* | | Merge "BluetoothMidiDevice: Cleanup and error handling improvements" into mnc...Mike Lockwood2015-05-081-15/+19
|\ \ \
| * | | BluetoothMidiDevice: Cleanup and error handling improvementsMike Lockwood2015-05-071-15/+19
* | | | Merge "AudioManager: add previous AudioPort list" into mnc-devEric Laurent2015-05-082-11/+53
|\ \ \ \ | |_|/ / |/| | |
| * | | AudioManager: add previous AudioPort listEric Laurent2015-05-082-11/+53
| | |/ | |/|
* | | MediaPlayer: pause media time when bufferingChong Zhang2015-05-071-1/+20
* | | Merge "MidiManager: Improve output of "dumpsys midi"" into mnc-devMike Lockwood2015-05-072-2/+4
|\ \ \ | | |/ | |/|
| * | MidiManager: Improve output of "dumpsys midi"Mike Lockwood2015-05-072-2/+4
| |/
* | Fix clang warnings on unused variable, mismatched tag, print format.Chih-Hung Hsieh2015-05-071-1/+1
|/
* Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.Jeff Brown2015-05-061-1/+1
* Revert "Initial draft of new MediaRouter APIs."Jeff Brown2015-05-0620-3748/+0
* Merge "Implement audio routing callbacks" into mnc-devEric Laurent2015-05-068-37/+146
|\
| * Implement audio routing callbacksEric Laurent2015-05-068-37/+146
* | Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-devJeff Tinker2015-05-061-3/+3
|\ \