summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am def7db5b: am 758dd527: Fix issue 2592680: Saved ringer volume forced to 0 ...Eric Laurent2010-04-141-17/+9
|\
| * Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in s...Eric Laurent2010-04-141-17/+9
* | am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume...Eric Laurent2010-04-141-0/+3
|\ \ | |/
| * Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mo...Eric Laurent2010-04-141-0/+3
| |\
| | * Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.Eric Laurent2010-04-141-0/+3
* | | am 6852b198: am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into...James Dong2010-04-141-0/+5
|\ \ \ | |/ /
| * | Use PV_PLAYER to handle RTSP streamingJames Dong2010-04-141-0/+5
| |/
* | fix unintentional driftJean-Baptiste Queru2010-04-142-14/+23
* | am c33f583b: am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types accor...James Dong2010-04-131-0/+2
|\ \
| * \ am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to http:...James Dong2010-04-131-0/+2
| |\ \ | | |/
| | * Snif more 3GPP file types according to http://www.ftyps.com/3gpp.htmlJames Dong2010-04-131-0/+2
* | | am d760afc3: am 30e9c2d4: am db281311: Merge "Better diagnostics in the stage...Andreas Huber2010-04-131-1/+1
|\ \ \ | |/ /
| * | am 30e9c2d4: am db281311: Merge "Better diagnostics in the stagefright comman...Andreas Huber2010-04-131-1/+1
| |\ \ | | |/
| | * Merge "Better diagnostics in the stagefright commandline tool, support for pl...Andreas Huber2010-04-131-1/+1
| | |\
| | | * Better diagnostics in the stagefright commandline tool, support for playing s...Andreas Huber2010-04-131-1/+1
* | | | am ebaa935e: am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component ro...James Dong2010-04-131-1/+1
|\ \ \ \ | |/ / /
| * | | am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component role while we q...James Dong2010-04-131-1/+1
| |\ \ \ | | |/ /
| | * | Merge "Don't set encoder component role while we query decoders" into froyoJames Dong2010-04-131-1/+1
| | |\ \
| | | * | Don't set encoder component role while we query decodersJames Dong2010-04-131-1/+1
* | | | | am b8430335: am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 Delay pausing m...Jean-Michel Trivi2010-04-131-11/+56
|\ \ \ \ \ | |/ / / /
| * | | | am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 Delay pausing music and rout...Jean-Michel Trivi2010-04-131-11/+56
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" i...Jean-Michel Trivi2010-04-131-11/+56
| | |\ \ \
| | | * | | Fix bug 2578813 Delay pausing music and routing audio for car docksJean-Michel Trivi2010-04-131-11/+56
* | | | | | am 465934d1: am d4c072d3: am b19da8e1: Fix for 2581725. Keep the last frame a...Gloria Wang2010-04-131-2/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d4c072d3: am b19da8e1: Fix for 2581725. Keep the last frame after resume()...Gloria Wang2010-04-131-2/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix for 2581725. Keep the last frame after resume(), and delete itGloria Wang2010-04-131-2/+14
| | |/ / /
* | | | | am a32efedd: am de3601e0: am bcac4960: Honor the "Never vibrate" setting for ...Daniel Sandler2010-04-131-4/+2
|\ \ \ \ \ | |/ / / /
| * | | | am de3601e0: am bcac4960: Honor the "Never vibrate" setting for incoming calls.Daniel Sandler2010-04-131-4/+2
| |\ \ \ \ | | |/ / /
| | * | | Honor the "Never vibrate" setting for incoming calls.Daniel Sandler2010-04-131-4/+2
| | | |/ | | |/|
* | | | am 445a9785: Merge "don\'t hardcode "mSurface" throughout our source code" in...Mathias Agopian2010-04-133-3/+3
|\ \ \ \ | |/ / /
| * | | Merge "don't hardcode "mSurface" throughout our source code" into krakenMathias Agopian2010-04-123-3/+3
| |\ \ \
| | * | | don't hardcode "mSurface" throughout our source codeMathias Agopian2010-04-123-3/+3
* | | | | am 7853c898: am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mp...Andreas Huber2010-04-125-11/+50
|\ \ \ \ \ | |/ / / /
| * | | | am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ig...Andreas Huber2010-04-125-11/+50
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we ...Andreas Huber2010-04-125-11/+50
* | | | manual mergeJean-Baptiste Queru2010-04-129-86/+307
|\ \ \ \ | |/ / /
| * | | am 98c5bd55: am 6dbf80d0: Merge "Fix a race condition in TimedEventQueue, an ...Andreas Huber2010-04-122-9/+36
| |\ \ \ | | |/ /
| | * | Merge "Fix a race condition in TimedEventQueue, an event may be cancelled whi...Andreas Huber2010-04-122-9/+36
| | |\ \ | | | |/ | | |/|
| | | * Fix a race condition in TimedEventQueue, an event may be cancelled while we'r...Andreas Huber2010-04-122-9/+36
| * | | am 54419a4f: am 12221b6f: Merge "Fix monkey bug 2586534 java.util.ConcurrentM...Jean-Michel Trivi2010-04-121-2/+6
| |\ \ \ | | |/ /
| | * | Merge "Fix monkey bug 2586534 java.util.ConcurrentModificationException Unlik...Jean-Michel Trivi2010-04-121-2/+6
| | |\ \ | | | |/ | | |/|
| | | * Fix monkey bug 2586534 java.util.ConcurrentModificationExceptionJean-Michel Trivi2010-04-091-2/+6
| |_|/ |/| |
| * | am f0a49f68: am 1d7a8b44: Merge "Fix a case where the aac hardware decoder is...Andreas Huber2010-04-121-1/+7
| |\ \ | | |/
| | * Merge "Fix a case where the aac hardware decoder is in a transition state and...Andreas Huber2010-04-121-1/+7
| | |\
| | | * Fix a case where the aac hardware decoder is in a transition state and refuse...Andreas Huber2010-04-121-1/+7
| |_|/ |/| |
| * | Merge "I accidentally broken passion encoding while working around problems w...Andreas Huber2010-04-121-8/+58
| |\ \
| | * | I accidentally broken passion encoding while working around problems with the...Andreas Huber2010-04-091-8/+58
| * | | Merge "Remove unnecessary lock from AMRWriter." into krakenAndreas Huber2010-04-121-21/+5
| |\ \ \ | | |/ /
| | * | Remove unnecessary lock from AMRWriter.Andreas Huber2010-04-091-21/+5
| * | | Merge "Various fixes to enable recording on passion and nexus1." into krakenAndreas Huber2010-04-124-49/+203
| |\ \ \ | | |/ /