summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | Clarify wording of MediaCrypto exception "ERROR_NO_KEY"Jeff Tinker2015-05-051-3/+3
* | | TIF: Make all the parameters for UNRATED nullJae Seo2015-05-053-10/+17
* | | media: Added MPEG2 profile/levels and testsHarish Mahendrakar2015-05-054-5/+101
* | | Merge changes from topic 'mwd-merge-050415' into mnc-devPrerepa Viswanadham2015-05-052-28/+135
|\ \ \
| * \ \ am 4816ebe8: am e8a8440d: am f1207122: Merge "MediaPlayer: provide mime type ...Robert Shih2015-05-011-10/+5
| |\ \ \
| | * \ \ am e8a8440d: am f1207122: Merge "MediaPlayer: provide mime type for all track...Robert Shih2015-05-011-10/+5
| | |\ \ \
| * | \ \ \ am 0486d03d: am 607dab36: am 05ebffe6: media: Hook up MediaPlayer and MediaSy...Lajos Molnar2015-05-016-133/+283
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 607dab36: am 05ebffe6: media: Hook up MediaPlayer and MediaSync to new set...Lajos Molnar2015-05-016-133/+283
| | |\ \ \ \
| * | \ \ \ \ am 0385dc8d: am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are acc...John Reck2015-05-011-4/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are accessed in a fe...John Reck2015-04-301-4/+5
| | |\ \ \ \ \
| | * \ \ \ \ \ am f7de1bc8: am 2757fed2: Merge "Clarifying which receiver method to call." i...Glenn Kasten2015-04-301-0/+4
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge "Clarifying which receiver method to call."Peter Brinkmann2015-04-301-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Clarifying which receiver method to call.Peter Brinkmann2015-04-301-0/+4
| * | | | | | | | | am c8efc449: am 3d42d238: am f764d219: Merge "AudioService receives callback ...Jean-Michel Trivi2015-04-305-4/+113
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | am 3d42d238: am f764d219: Merge "AudioService receives callback for dynamic p...Jean-Michel Trivi2015-04-305-4/+113
| | |\ \ \ \ \ \ \ \