summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Expand)AuthorAgeFilesLines
* Merge "MediaSync: address API review." into mnc-devWei Jia2015-05-085-123/+117
|\
| * MediaSync: address API review.Wei Jia2015-05-085-123/+117
* | Merge "media: merge CodecException's getErrorCode and getReason." into mnc-devRonghua Wu2015-05-081-25/+8
|\ \
| * | media: merge CodecException's getErrorCode and getReason.Ronghua Wu2015-05-081-25/+8
* | | 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
* | MidiManager: Improve output of "dumpsys midi"Mike Lockwood2015-05-072-2/+4
|/
* 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-051-0/+80
* | | 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-011-42/+18
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 607dab36: am 05ebffe6: media: Hook up MediaPlayer and MediaSync to new set...Lajos Molnar2015-05-011-42/+18
| | |\ \ \ \
| | * \ \ \ \ 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
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ am edcf5e1e: am f17dd0b4: am 1afdbe3b: Merge "Pass PlaybackSettings as class ...Andy Hung2015-04-301-30/+4
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am f17dd0b4: am 1afdbe3b: Merge "Pass PlaybackSettings as class object for Au...Andy Hung2015-04-301-30/+4
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ am 62b4cbce: am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version str...Mike Lockwood2015-04-291-0/+7
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version string property"...Mike Lockwood2015-04-291-0/+7
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ am 0dbaba6c: am 5e47c802: am 56867804: Merge "Respect the record audio app op...Svet Ganov2015-04-295-14/+68
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 5e47c802: am 56867804: Merge "Respect the record audio app op - framework"...Svet Ganov2015-04-295-14/+68
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ am 23e46a4e: am 2d67b288: am 8dbcda1b: Merge "Volume: Simple dialog footer, D...John Spurlock2015-04-291-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 2d67b288: am 8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick s...John Spurlock2015-04-291-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ am d3fad391: am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an o...Dongwon Kang2015-04-291-5/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an operation take...Dongwon Kang2015-04-291-5/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge "TIF: Put comments for the newly added US and Canadian rating strings"Jae Seo2015-04-291-0/+87
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | TIF: Put comments for the newly added US and Canadian rating stringsJae Seo2015-03-171-0/+87
| * | | | | | | | | | | | | resolved conflicts for merge of 375e21f8 to mnc-dev-plus-aospMarco Nelissen2015-04-281-28/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Sometimes the application context is null"Marco Nelissen2015-04-281-35/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Sometimes the application context is nullMarco Nelissen2015-04-221-35/+55
| | * | | | | | | | | | | | | | Merge "Revert "Sometimes the application context is null""Marco Nelissen2015-04-221-54/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Revert "Sometimes the application context is null"Marco Nelissen2015-04-221-54/+34
| | * | | | | | | | | | | | | | | Merge "Sometimes the application context is null"Marco Nelissen2015-04-221-34/+54
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Sometimes the application context is nullMarco Nelissen2015-04-211-34/+54
| | | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "MediaPlayer: setSubtitleAnchor on a HandlerThread" into mnc-devRobert Shih2015-05-041-12/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | MediaPlayer: setSubtitleAnchor on a HandlerThreadRobert Shih2015-05-041-12/+40
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | MediaSync: clean up configureAudioTrack and configureSurface.Wei Jia2015-05-041-13/+9
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Add camera app op - frameworkSvetoslav2015-05-024-52/+5
* | | | | | | | | | | | | | | Merge "media: hook up MediaCodec.setSurface" into mnc-devLajos Molnar2015-05-021-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | media: hook up MediaCodec.setSurfaceLajos Molnar2015-05-011-3/+3
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |