summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "media: discard duplicate CEA-608 ctrl code"Chong Zhang2015-02-111-1/+11
|\
| * media: discard duplicate CEA-608 ctrl codeChong Zhang2015-02-091-1/+11
* | am 6da3cc59: am 396f131d: Merge "Fix memory leak"Marco Nelissen2015-02-111-0/+1
|\ \
| * \ am 6da3cc59: am 396f131d: Merge "Fix memory leak"Marco Nelissen2015-02-111-0/+1
| |\ \
| | * | Fix memory leakMarco Nelissen2015-02-101-0/+1
* | | | Move AudioService to services.John Spurlock2015-02-099-8903/+136
* | | | Merge "Delay unmuting on volume down"RoboErik2015-02-091-10/+55
|\ \ \ \ | |_|_|/ |/| | |
| * | | Delay unmuting on volume downRoboErik2015-02-091-10/+55
* | | | am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev auto...Chong Zhang2015-02-061-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-devChong Zhang2015-02-061-1/+1
| |\ \ \
| | * \ \ Merge "reset col position to 1 on row PAC" into lmp-mr1-devChong Zhang2015-02-061-1/+1
| | |\ \ \
| | | * | | reset col position to 1 on row PACChong Zhang2015-02-051-1/+1
* | | | | | Merge "Make isStreamMute correctly handle master volume devices"RoboErik2015-02-051-1/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Make isStreamMute correctly handle master volume devicesRoboErik2015-02-041-1/+5
* | | | | | Merge "Add additional info to AudioPort for enum/selection API."Paul McLean2015-02-058-38/+115
|\ \ \ \ \ \
| * | | | | | Add additional info to AudioPort for enum/selection API.Paul McLean2015-02-048-38/+115
* | | | | | | Merge "Use shared value for default muteable streams."John Spurlock2015-02-051-5/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use shared value for default muteable streams.John Spurlock2015-02-051-5/+8
* | | | | | | am 4c49b1fb: am b2d7ca7c: am fd2c1307: Merge "Fix build."Elliott Hughes2015-02-041-4/+4
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am b2d7ca7c: am fd2c1307: Merge "Fix build."Elliott Hughes2015-02-041-4/+4
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Fix build.Elliott Hughes2015-02-041-4/+4
* | | | | | | Merge "MediaCodecInfo: remove stack trace logspam when querying invalid sizes"Lajos Molnar2015-02-041-4/+4
|\ \ \ \ \ \ \
| * | | | | | | MediaCodecInfo: remove stack trace logspam when querying invalid sizesLajos Molnar2015-01-291-4/+4
* | | | | | | | am b86a4558: am 015fdf39: Merge "audio: allow audio port cache update even wh...Wonsik Kim2015-02-031-7/+24
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 015fdf39: Merge "audio: allow audio port cache update even when audio patc...Wonsik Kim2015-02-031-7/+24
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | audio: allow audio port cache update even when audio patches contain invalida...Wonsik Kim2015-01-311-7/+24
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge "AudioAttributes javadoc update for conversion to stream types"Jean-Michel Trivi2015-02-031-1/+7
|\ \ \ \ \ \ \
| * | | | | | | AudioAttributes javadoc update for conversion to stream typesJean-Michel Trivi2015-02-031-1/+7
* | | | | | | | TIF: Add a comment to remove padding around the channel logo imageJae Seo2015-02-031-2/+3
|/ / / / / / /
* | | | | | | Merge "Clarify that flush does not necessarily free up buffer space"Glenn Kasten2015-02-021-1/+7
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Clarify that flush does not necessarily free up buffer spaceGlenn Kasten2015-02-021-1/+7
* | | | | | | Merge "Route volume keys directly to the audio system on TVs"RoboErik2015-02-022-13/+25
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Route volume keys directly to the audio system on TVsRoboErik2015-01-292-13/+25
* | | | | | | Merge "Move mute/unmute handling to adjust volume paths"RoboErik2015-01-306-301/+185
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Move mute/unmute handling to adjust volume pathsRoboErik2015-01-296-301/+185
* | | | | | Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-...Lajos Molnar2015-01-292-10/+20
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-...Lajos Molnar2015-01-292-10/+20
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | ImageReader: add support for compatible flexYUV buffersLajos Molnar2015-01-282-10/+20
* | | | | | am 4b1e5814: am 71191442: TIF: Do not call session callbacks when the session...Jae Seo2015-01-291-9/+27
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | am 4b1e5814: am 71191442: TIF: Do not call session callbacks when the session...Jae Seo2015-01-291-9/+27
| |\ \ \ \ | | |/ / /
| | * | | TIF: Do not call session callbacks when the session is already releasedJae Seo2015-01-281-9/+27
* | | | | Merge "Add getMediaItem API to MediaBrowser"RoboErik2015-01-283-21/+163
|\ \ \ \ \
| * | | | | Add getMediaItem API to MediaBrowserRoboErik2015-01-263-21/+163
* | | | | | am 3ea395dd: am 4e853598: Merge "Fix printf format"Marco Nelissen2015-01-271-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 3ea395dd: am 4e853598: Merge "Fix printf format"Marco Nelissen2015-01-271-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Fix printf formatMarco Nelissen2015-01-271-2/+2
* | | | | | am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"Marco Nelissen2015-01-277-28/+1470
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"Marco Nelissen2015-01-277-28/+1470
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Make SoundPool use MediaCodec"Marco Nelissen2015-01-277-28/+1470
| | |\ \ \ \
| | | * | | | Make SoundPool use MediaCodecMarco Nelissen2015-01-237-28/+1470