summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Expand)AuthorAgeFilesLines
* Merge "AudioTrack error checks"Glenn Kasten2012-12-061-25/+39
|\
| * AudioTrack error checksGlenn Kasten2012-12-051-25/+39
* | Merge "Allow more APIs before write in static buffer mode"Glenn Kasten2012-12-061-6/+6
|\ \
| * | Allow more APIs before write in static buffer modeGlenn Kasten2012-11-291-6/+6
* | | Merge "Use the utility logging methods and single tag"Glenn Kasten2012-12-061-8/+7
|\ \ \
| * | | Use the utility logging methods and single tagGlenn Kasten2012-11-291-8/+7
| |/ /
* | | Merge "Document that ByteBuffer position not updated"Glenn Kasten2012-12-061-0/+2
|\ \ \
| * | | Document that ByteBuffer position not updatedGlenn Kasten2012-11-081-0/+2
* | | | Merge "Remove dead method native_get_session_id()"Glenn Kasten2012-12-061-2/+0
|\ \ \ \
| * | | | Remove dead method native_get_session_id()Glenn Kasten2012-11-291-2/+0
| | |/ / | |/| |
* | | | Merge "more fixes on safe volume warning message"Eric Laurent2012-12-061-35/+79
|\ \ \ \
| * | | | more fixes on safe volume warning messageEric Laurent2012-12-051-35/+79
* | | | | Merge "Remove whitespace at end of line"Glenn Kasten2012-12-061-84/+83
|\ \ \ \ \
| * | | | | Remove whitespace at end of lineGlenn Kasten2012-11-291-84/+83
| | |/ / / | |/| | |
* | | | | Merge "Import only what's needed"Glenn Kasten2012-12-063-7/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Import only what's neededGlenn Kasten2012-11-293-7/+0
| |/ / /
* | | | Merge "Make mInitializationLooper final"Glenn Kasten2012-12-051-3/+5
|\ \ \ \
| * | | | Make mInitializationLooper finalGlenn Kasten2012-11-291-3/+5
| |/ / /
* | | | Merge "Simplify throw statements"Glenn Kasten2012-12-051-12/+12
|\ \ \ \
| * | | | Simplify throw statementsGlenn Kasten2012-11-291-12/+12
| |/ / /
* | | | Merge "Remove redundant AudioTrack. qualifiers"Glenn Kasten2012-12-051-6/+6
|\ \ \ \
| * | | | Remove redundant AudioTrack. qualifiersGlenn Kasten2012-12-051-6/+6
| | |/ / | |/| |
* | | | Make it clear that non-optional MediaFormat keys are requiredAndreas Huber2012-12-051-2/+2
|/ / /
* | | Merge "Allow mute when playing over fixed volume device"Eric Laurent2012-12-041-104/+125
|\ \ \
| * | | Allow mute when playing over fixed volume deviceEric Laurent2012-12-041-104/+125
* | | | Merge "Replace hard-coded sample rate values by constants"Glenn Kasten2012-12-041-2/+7
|\ \ \ \
| * | | | Replace hard-coded sample rate values by constantsGlenn Kasten2012-11-291-2/+7
| | |/ / | |/| |
* | | | Merge "Fix default ring/alarm/notification insertion"Marco Nelissen2012-12-031-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix default ring/alarm/notification insertionMarco Nelissen2012-12-031-0/+1
* | | | am 800c8ab6: am 2644494a: Merge changes I8462f040,Ie471f40fAndreas Huber2012-11-302-0/+20
|\ \ \ \ | |/ / / |/| | |
| * | | am 2644494a: Merge changes I8462f040,Ie471f40fAndreas Huber2012-11-302-0/+20
| |\ \ \
| | * \ \ Merge changes I8462f040,Ie471f40fAndreas Huber2012-11-302-0/+20
| | |\ \ \
| | | * | | MediaCodec: Allow getting the codec info directlyMartin Storsjo2012-11-142-0/+14
| | | * | | MediaCodec: Allow getting the chosen component nameMartin Storsjo2012-11-141-0/+6
* | | | | | am b46857d2: am b1f45c4a: am c3eb57b2: Merge "AudioService: improve initial s...Eric Laurent2012-11-301-61/+97
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 2a1f11e9: am 57c23a46: am 10479a29: Merge "Clean up behavior of type argum...Adam Powell2012-11-291-2/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | 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 015ec39d: am 5985d106: am c7dd6640: Merge "Fix audio focus evaluation orde...Jean-Michel Trivi2012-11-201-8/+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 803db164: am aeb62686: Merge "Fallback to fallbackring if ringtone can\'t ...Marco Nelissen2012-11-161-2/+45
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 35de4831: am d1e8f467: am 99a86d06: Clarify that MediaFormat.KEY_IS_ADTS o...Andreas Huber2012-11-141-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | 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