summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 32de26bb: am c8652199: merge from open-source masterThe Android Open Source Project2010-04-281-1/+1
|\
| * am c8652199: merge from open-source masterThe Android Open Source Project2010-04-281-1/+1
| |\
| | * merge from open-source masterThe Android Open Source Project2010-04-281-1/+1
| | |\
| | | * speling fixhugh kennedy2010-04-281-1/+1
* | | | am b30bf6ef: Merge "Use timestamp from camera driver for CameraSource" into k...James Dong2010-04-285-68/+118
|\ \ \ \ | |/ / /
| * | | Use timestamp from camera driver for CameraSourceJames Dong2010-04-285-68/+118
* | | | am 40eb3f7b: am 31431b34: am 374aee68: Switch to use software MP3 decoder Har...James Dong2010-04-261-1/+1
|\ \ \ \ | |/ / /
| * | | am 31431b34: am 374aee68: Switch to use software MP3 decoder Hardware MP3 dec...James Dong2010-04-261-1/+1
| |\ \ \ | | |/ /
| | * | Switch to use software MP3 decoderJames Dong2010-04-261-1/+1
* | | | am 460587e9: am f6adae78: am 47dad8fa: Merge "Fix bug 2619062 Music is routed...Jean-Michel Trivi2010-04-231-2/+17
|\ \ \ \ | |/ / /
| * | | am f6adae78: am 47dad8fa: Merge "Fix bug 2619062 Music is routed to Phone spe...Jean-Michel Trivi2010-04-231-2/+17
| |\ \ \ | | |/ /
| | * | Fix bug 2619062 Music is routed to Phone speaker, though it isJean-Michel Trivi2010-04-231-2/+17
* | | | am f5e20801: am 89e28cbe: am 9e609b0d: Merge "Apparently select() does not im...Andreas Huber2010-04-202-27/+14
|\ \ \ \ | |/ / /
| * | | am 89e28cbe: am 9e609b0d: Merge "Apparently select() does not immediately ret...Andreas Huber2010-04-202-27/+14
| |\ \ \ | | |/ /
| | * | Merge "Apparently select() does not immediately return if one of the masked s...Andreas Huber2010-04-202-27/+14
| | |\ \
| | | * | Apparently select() does not immediately return if one of the masked socket d...Andreas Huber2010-04-202-27/+14
* | | | | am 219dbb67: am 8dc4c790: am fe8620ac: Merge "Update AudioService to reflect ...Jean-Michel Trivi2010-04-201-29/+52
|\ \ \ \ \ | |/ / / /
| * | | | am 8dc4c790: am fe8620ac: Merge "Update AudioService to reflect phone state c...Jean-Michel Trivi2010-04-201-29/+52
| |\ \ \ \ | | |/ / /
| | * | | Update AudioService to reflect phone state changes with AudioFocus.Jean-Michel Trivi2010-04-201-29/+52
| | |/ /
* | | | am c9553f2e: am 1e1edb2c: am 25dc5f30: Merge "Don\'t coalesce more than 250ms...Andreas Huber2010-04-201-2/+12
|\ \ \ \ | |/ / /
| * | | am 1e1edb2c: am 25dc5f30: Merge "Don\'t coalesce more than 250ms worth of enc...Andreas Huber2010-04-201-2/+12
| |\ \ \ | | |/ /
| | * | Merge "Don't coalesce more than 250ms worth of encoded data into a single cod...Andreas Huber2010-04-201-2/+12
| | |\ \
| | | * | Don't coalesce more than 250ms worth of encoded data into a single codec inpu...Andreas Huber2010-04-201-2/+12
* | | | | am fe13eebe: am 9d14e3ea: am 9b8b417c: Merge "When updating existing entries ...Marco Nelissen2010-04-201-2/+6
|\ \ \ \ \ | |/ / / /
| * | | | am 9d14e3ea: am 9b8b417c: Merge "When updating existing entries in the media ...Marco Nelissen2010-04-201-2/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge "When updating existing entries in the media database, don't update the...Marco Nelissen2010-04-201-2/+6
| | |\ \ \
| | | * | | When updating existing entries in the media database, don't updateMarco Nelissen2010-04-201-2/+6
| | | |/ /
* | | | | am 5b550c9e: am 11bae140: am 3891c4cc: Fix issue 2602879: camera shutter soun...Eric Laurent2010-04-201-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | am 11bae140: am 3891c4cc: Fix issue 2602879: camera shutter sound not playing.Eric Laurent2010-04-201-0/+6
| |\ \ \ \ | | |/ / /
| | * | | Fix issue 2602879: camera shutter sound not playing.Eric Laurent2010-04-201-0/+6
* | | | | am e33e9db6: am 3cd1f9f9: am 3b591260: Fix issue 2604270 Device auto connect...Eric Laurent2010-04-201-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | am 3cd1f9f9: am 3b591260: Fix issue 2604270 Device auto connects to Car Dock...Eric Laurent2010-04-201-0/+3
| |\ \ \ \ | | |/ / /
| | * | | Fix issue 2604270 Device auto connects to Car Dock (Media profile) after und...Eric Laurent2010-04-201-0/+3
| | |/ /
* | | | am 5c14f2d0: am def7db5b: am 758dd527: Fix issue 2592680: Saved ringer volume...Eric Laurent2010-04-151-17/+9
|\ \ \ \ | |/ / /
| * | | 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 5db9adfd: am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ...Eric Laurent2010-04-151-0/+3
|\ \ \ \ | |/ / /
| * | | 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 fff02afa: am 6852b198: am d3d445b1: Merge "Use PV_PLAYER to handle RTSP st...James Dong2010-04-151-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | |/ /
* | | | am 31a17033: fix unintentional driftJean-Baptiste Queru2010-04-152-14/+23
|\ \ \ \ | |/ / /
| * | | fix unintentional driftJean-Baptiste Queru2010-04-142-14/+23
* | | | am 748a8df0: am c33f583b: am 4f3257cf: am dd684af8: Merge "Snif more 3GPP fil...James Dong2010-04-131-0/+2
|\ \ \ \ | |/ / /
| * | | 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 5ab60ba0: am d760afc3: am 30e9c2d4: am db281311: Merge "Better diagnostics...Andreas Huber2010-04-131-1/+1
|\ \ \ \ \ | |/ / / /