summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"Amith Yamasani2013-01-281-1/+1
|\
| * am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"Amith Yamasani2013-01-281-1/+1
| |\
| | * Fix possible integer overflow in MtpStorageHenrik Engström2013-01-091-1/+1
* | | am e71bb772: am f9719d11: am daf9b7d1: am 3f72bf32: Merge "Refactoring the me...Jason Noguchi2013-01-072-175/+224
|\ \ \
| * \ \ am 3f72bf32: Merge "Refactoring the media recorder stress test. Added test ca...Jason Noguchi2013-01-072-175/+224
| |\ \ \
| | * \ \ Merge "Refactoring the media recorder stress test. Added test cases for: - re...Jason Noguchi2013-01-072-175/+224
| | |\ \ \
| | | * | | Refactoring the media recorder stress test.Jason Noguchi2013-01-032-175/+224
* | | | | | am be6ff0b8: am 66480258: am ba5fd35e: am 7b4e597f: Merge "Adding camera scen...Jason Noguchi2013-01-071-54/+135
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-devJason Noguchi2013-01-071-54/+135
| |\ \ \ \ | | |/ / /
| | * | | Adding camera scene mode stress test.Jason Noguchi2013-01-021-54/+135
| | |/ /
* | | | am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberEffects"James Dong2012-12-211-2/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "Handle errors from AudioEffect::queryNumberEffects"James Dong2012-12-211-2/+5
| |\ \ \
| | * | | Handle errors from AudioEffect::queryNumberEffectsPeter Karlsson2012-11-161-2/+5
* | | | | am c8db3b8a: Merge "Set "isdrm" info in Mediastore"James Dong2012-12-211-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Set "isdrm" info in Mediastore"James Dong2012-12-211-1/+2
| |\ \ \ \
| | * | | | Set "isdrm" info in MediastoreErik Almqvist2012-12-061-1/+2
* | | | | | am 62ec9588: Merge "Fix typo"Andrew Hsieh2012-12-202-8/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix typoAndrew Hsieh2012-12-192-8/+8
| |/ / / /
* | | | | am bb2985aa: am 683028ca: Merge "Make it clear that non-optional MediaFormat ...Andreas Huber2012-12-061-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Make it clear that non-optional MediaFormat keys are requiredAndreas Huber2012-12-051-2/+2
* | | | | am 2644494a: Merge changes I8462f040,Ie471f40fAndreas Huber2012-11-305-0/+84
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge changes I8462f040,Ie471f40fAndreas Huber2012-11-305-0/+84
| |\ \ \ \
| | * | | | MediaCodec: Allow getting the codec info directlyMartin Storsjo2012-11-143-0/+36
| | * | | | MediaCodec: Allow getting the chosen component nameMartin Storsjo2012-11-143-0/+48
| | | |/ / | | |/| |
* | | | | am b1f45c4a: am c3eb57b2: Merge "AudioService: improve initial safe volume de...Eric Laurent2012-11-301-61/+97
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-devEric Laurent2012-11-301-61/+97
| |\ \ \ \
| | * | | | AudioService: improve initial safe volume delayEric Laurent2012-11-291-61/+97
* | | | | | am 57c23a46: am 10479a29: Merge "Clean up behavior of type arguments for Medi...Adam Powell2012-11-291-2/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Clean up behavior of type arguments for MediaRouter#getSelectedRouteAdam Powell2012-11-281-2/+14
* | | | | | am 5985d106: am c7dd6640: Merge "Fix audio focus evaluation order for display...Jean-Michel Trivi2012-11-201-8/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix audio focus evaluation order for display updateJean-Michel Trivi2012-11-201-8/+14
| |/ / / /
* | | | | am aeb62686: Merge "Fallback to fallbackring if ringtone can\'t be played."Marco Nelissen2012-11-161-2/+45
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fallback to fallbackring if ringtone can't be played.Oscar Rydhé2012-11-161-2/+45
| | |/ / | |/| |
* | | | am d1e8f467: am 99a86d06: Clarify that MediaFormat.KEY_IS_ADTS only applies t...Andreas Huber2012-11-141-1/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio contentAndreas Huber2012-11-141-1/+3
* | | | am 67a3fb6f: am c10914ca: Merge "Support Wifi display devices that rename the...Craig Mautner2012-11-131-1/+1
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-devCraig Mautner2012-11-131-1/+1
| |\ \
| | * | Support Wifi display devices that rename themselves.Jeff Brown2012-11-071-1/+1
| | |/
* | | am 2b988843: am 30717b68: Merge "AudioService: undock audio glitch - DO NOT M...Eric Laurent2012-11-081-9/+11
|\ \ \ | |/ /
| * | AudioService: undock audio glitch - DO NOT MERGEEric Laurent2012-11-081-9/+11
* | | am 98e5c814: am 73176865: Merge "audio service fix dock after crash - DO NOT ...Eric Laurent2012-11-081-0/+7
|\ \ \ | |/ /
| * | audio service fix dock after crash - DO NOT MERGEEric Laurent2012-11-081-0/+7
| |/
* | am 768d9e1a: Merge "Correct executable bit for source files"Kenny Root2012-11-0777-0/+0
|\ \
| * | Correct executable bit for source filesKenny Root2012-11-0778-0/+0
* | | am 7a4d856c: Merge "Removed offensive music genre"Marco Nelissen2012-11-051-2/+2
|\ \ \ | |/ / | | / | |/ |/|
| * Merge "Removed offensive music genre"Marco Nelissen2012-11-051-2/+2
| |\
| | * Removed offensive music genreJohan Redestig2012-08-311-2/+2
* | | Merge "audio service: make dock audio is off by default" into jb-mr1-devEric Laurent2012-10-291-1/+1
|\ \ \
| * | | audio service: make dock audio is off by defaultEric Laurent2012-10-291-1/+1
* | | | No playback and music widget from other user on user switchJean-Michel Trivi2012-10-291-2/+34
|/ / /