summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | am 81192f85: am c109190b: Add support for gps altitude EXIF tags.Wu-cheng Li2010-05-271-5/+35
|\ \ \ \ \ | |/ / / /
| * | | | Add support for gps altitude EXIF tags.Wu-cheng Li2010-05-271-5/+35
* | | | | am 132f46ff: am df17b084: Merge "Support for media extraction from .mkv/.mka ...Andreas Huber2010-05-211-2/+7
|\ \ \ \ \ | |/ / / /
| * | | | Support for media extraction from .mkv/.mka Matroska files in stagefright.Andreas Huber2010-05-201-2/+7
| |/ / /
* | | | am 6914e17a: am 08eff49f: am d9712b69: am b1235a57: Merge "Hide two audio foc...Xavier Ducrohet2010-05-121-0/+2
|\ \ \ \ | |/ / /
| * | | am b1235a57: Merge "Hide two audio focus methods." into froyoXavier Ducrohet2010-05-121-0/+2
| |\ \ \ | | |/ /
| | * | Merge "Hide two audio focus methods." into froyoXavier Ducrohet2010-05-111-0/+2
| | |\ \
| | | * | Hide two audio focus methods.Xavier Ducrohet2010-05-111-0/+2
* | | | | am 11291901: am 550884e2: am bbafdc64: am 836b2d75: Merge "Don\'t clear the _...Marco Nelissen2010-05-121-2/+5
|\ \ \ \ \ | |/ / / /
| * | | | am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, si...Marco Nelissen2010-05-121-2/+5
| |\ \ \ \ | | |/ / /
| | * | | Don't clear the _data column in the audio_meta table, since it isn'tMarco Nelissen2010-05-111-2/+5
| | |/ /
* | | | am 4f9c9aa8: am fd5a747f: am 0c73adb1: am 3e90c76c: Merge "Update javadoc in ...Jean-Michel Trivi2010-05-121-9/+15
|\ \ \ \ | |/ / /
| * | | am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide ...Jean-Michel Trivi2010-05-121-9/+15
| |\ \ \ | | |/ /
| | * | Update javadoc in android.media.AudioManager to not hide theJean-Michel Trivi2010-05-111-9/+15
* | | | am 11e26c28: am 9f35d39a: am ea37d9b4: am aaa01b18: Merge " Fix bug 267039...Jean-Michel Trivi2010-05-122-22/+25
|\ \ \ \ | |/ / /
| * | | am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects...Jean-Michel Trivi2010-05-122-22/+25
| |\ \ \ | | |/ /
| | * | Fix bug 2670395 and 2599698Jean-Michel Trivi2010-05-112-22/+25
* | | | am 32de26bb: 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 460587e9: am f6adae78: am 47dad8fa: Merge "Fix bug 2619062 Music is routed...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 219dbb67: am 8dc4c790: am fe8620ac: Merge "Update AudioService to reflect ...Jean-Michel Trivi2010-04-201-29/+52
|\ \ \ | |/ /
| * | Update AudioService to reflect phone state changes with AudioFocus.Jean-Michel Trivi2010-04-201-29/+52
* | | am fe13eebe: am 9d14e3ea: am 9b8b417c: Merge "When updating existing entries ...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
|\ \ \ \ | |/ / /
| * | | 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
|\ \ \ \ | |/ / /
| * | | 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
|\ \ \ | |/ /
| * | 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
|\ \ \ | |/ /
| * | Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.Eric Laurent2010-04-141-0/+3
* | | am 824ca797: am b8430335: am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 De...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 cd3f349f: am a32efedd: am de3601e0: am bcac4960: Honor the "Never vibrate"...Daniel Sandler2010-04-131-4/+2
|\ \ \ | |/ /
| * | Honor the "Never vibrate" setting for incoming calls.Daniel Sandler2010-04-131-4/+2
* | | am cd839752: manual mergeJean-Baptiste Queru2010-04-121-2/+6
|\ \ \ | |/ /
| * | Fix monkey bug 2586534 java.util.ConcurrentModificationExceptionJean-Michel Trivi2010-04-091-2/+6
* | | am e4b62c23: am 84d12f3f: am dbad286c: am 25c2dd60: Merge "Per requested by A...Ray Chen2010-04-071-30/+30
|\ \ \ | |/ /
| * | Per requested by API council, rename MediaScannerConneciton.ScanResultListene...Ray Chen2010-04-071-30/+30
* | | am 507748e9: am 6c935602: am 44dcf658: Make createVideoThumbnail and createIm...Ray Chen2010-04-051-128/+43
|\ \ \ | |/ /
| * | Make createVideoThumbnail and createImageThumbnail look consistent.Ray Chen2010-04-051-128/+43
* | | am 055897ac: am 28525488: am 9ab05fff: Merge "Fix bug 2565463 Ensure an objec...Jean-Michel Trivi2010-04-022-1/+9
|\ \ \ | |/ /
| * | Fix bug 2565463 Ensure an object cannot appear twice in theJean-Michel Trivi2010-04-012-1/+9
* | | am 85bc2ae1: am d12d6c30: am ccc17b34: Merge "Public API changes for CameraPr...James Dong2010-04-013-59/+109
|\ \ \ | |/ /
| * | Public API changes for CameraProfile and CamcorderProfile classesJames Dong2010-04-013-59/+109
* | | Add isSilentMode initially hidden before API council approval, test case to b...Glenn Kasten2010-03-311-0/+18
|/ /