summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Begin transition was invalidated when the image duration was changed."Gil Dobjanschi2010-11-221-13/+22
|\
| * Begin transition was invalidated when the image duration was changed.Gil Dobjanschi2010-11-221-13/+22
* | Merge "Squashed commit of the following:"Andreas Huber2010-11-2213-679/+513
|\ \
| * | Squashed commit of the following:Andreas Huber2010-11-2213-679/+513
* | | Unhide android.media.AudioManager.MODE_IN_COMMUNICATIONJean-Michel Trivi2010-11-221-3/+4
* | | Fixed an issue in SampleTable where the table index was incorrectly wrapped a...James Dong2010-11-211-1/+3
|/ /
* | Merge "Fixed MediaPlayer unit test issues"James Dong2010-11-197-12/+12
|\ \
| * | Fixed MediaPlayer unit test issuesJames Dong2010-11-197-12/+12
* | | am 716f60ce: resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aospJean-Baptiste Queru2010-11-191-4/+5
|\ \ \
| * \ \ resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aospJean-Baptiste Queru2010-11-191-4/+5
| |\ \ \
| | * | | StagefrightMediaScanner: Call endFile() for MIDI and OGG files.Hiroshi Takekawa2010-11-191-8/+10
| * | | | am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/m...Jean-Baptiste Queru2010-11-191-1/+1
| |\ \ \ \ | | |/ / /
| | * | | build failed with g++ v. 4.4.5Matthias Bady2010-11-181-1/+1
| * | | | am f6bd761f: Use back-facing camera as default in camera/camcorder profile.do...Wu-cheng Li2010-11-082-5/+29
| |\ \ \ \
| | * | | | Use back-facing camera as default in camera/camcorder profile.do not mergeWu-cheng Li2010-11-092-5/+29
* | | | | | Merge "Removed uncessary FILE structure pointer for I/O"James Dong2010-11-196-58/+74
|\ \ \ \ \ \
| * | | | | | Removed uncessary FILE structure pointer for I/OJames Dong2010-11-196-58/+74
| | |_|_|/ / | |/| | | |
* | | | | | Merge "Fix issue 3157123."Eric Laurent2010-11-194-41/+45
|\ \ \ \ \ \
| * | | | | | Fix issue 3157123.Eric Laurent2010-11-194-41/+45
* | | | | | | Merge "CameraBrowser: temporarily move to system partition"Mike Lockwood2010-11-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | CameraBrowser: temporarily move to system partitionMike Lockwood2010-11-191-1/+1
* | | | | | | | Merge "CameraBrowser improvements:"Mike Lockwood2010-11-197-73/+116
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | CameraBrowser improvements:Mike Lockwood2010-11-197-73/+116
* | | | | | | | Merge "PTP: Fix permissions problems with files imported via PTP"Mike Lockwood2010-11-193-4/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | PTP: Fix permissions problems with files imported via PTPMike Lockwood2010-11-193-4/+13
* | | | | | | | Merge "Fix an artifact of going from off_t to off64_t"Andreas Huber2010-11-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix an artifact of going from off_t to off64_tAndreas Huber2010-11-191-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Remove command line mtp host tool"Mike Lockwood2010-11-194-655/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Remove command line mtp host toolMike Lockwood2010-11-194-655/+0
| |/ / / / / /
* | | | | | | Squashed commit of the following:Andreas Huber2010-11-197-168/+27
|/ / / / / /
* | | | | | PTP: Improve performance and reliability of file importingMike Lockwood2010-11-1910-250/+127
|/ / / / /
* | | | | Merge "64-bit file size/offset support for media framework"James Dong2010-11-1837-219/+225
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 64-bit file size/offset support for media frameworkJames Dong2010-11-1837-219/+225
* | | | | Merge "AudioTrack getTimelineDuration clarification."Gil Dobjanschi2010-11-181-10/+3
|\ \ \ \ \
| * | | | | AudioTrack getTimelineDuration clarification.Gil Dobjanschi2010-11-181-10/+3
* | | | | | Set the external display usage bit in Stagefright.Jamie Gennis2010-11-182-2/+2
|/ / / / /
* | | | | Merge "Added IOException to WaveformData constructor"Gil Dobjanschi2010-11-184-3/+11
|\ \ \ \ \
| * | | | | Added IOException to WaveformData constructorGil Dobjanschi2010-11-184-3/+11
* | | | | | Log H.264 profile/level in OMXCodecAndreas Huber2010-11-181-1/+1
| |/ / / / |/| | | |
* | | | | Merge "Support for "chunked" HTTP transfer encoding."Andreas Huber2010-11-184-21/+136
|\ \ \ \ \
| * | | | | Support for "chunked" HTTP transfer encoding.Andreas Huber2010-11-184-21/+136
* | | | | | Merge "Fix an issue wherre error notification will not be sent after mediapla...James Dong2010-11-181-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix an issue wherre error notification will not be sent after mediaplayer resetJames Dong2010-11-181-0/+3
| |/ / / /
* | | | | Merge "Add getUri() for streaming"Gloria Wang2010-11-184-0/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add getUri() for streamingGloria Wang2010-11-184-0/+9
* | | | | Merge "Disable ducking by default. Changed ducking threshold parameter range."Gil Dobjanschi2010-11-171-4/+5
|\ \ \ \ \
| * | | | | Disable ducking by default. Changed ducking threshold parameter range.Gil Dobjanschi2010-11-171-4/+5
* | | | | | Fix bug 3183484 unhide MediaRecorder.AudioSource.VOICE_COMMUNICATIONJean-Michel Trivi2010-11-171-6/+4
* | | | | | MTP: Fixes to allow file transfers > 4 gigabytesMike Lockwood2010-11-174-5/+27
|/ / / / /
* | | | | Merge "MTP: Set correct format for abstract audio playlists"Mike Lockwood2010-11-172-0/+3
|\ \ \ \ \