| Commit message (Expand) | Author | Age | Files | Lines |
* | fix inaccurate copyrights | Jean-Baptiste Queru | 2010-07-29 | 3 | -3/+3 |
* | move native services under services/ | Mathias Agopian | 2010-07-22 | 1 | -2/+2 |
* | merge from open-source master | The Android Open Source Project | 2010-06-18 | 1 | -1/+5 |
|\ |
|
| * | Change in media scanner to set correct date | Mikael2 Svensson | 2010-06-06 | 1 | -1/+5 |
* | | am 39e876ad: Merge "When filling the cache, we always time out waiting for a ... | James Dong | 2010-06-17 | 1 | -1/+3 |
|\ \ |
|
| * \ | Merge "When filling the cache, we always time out waiting for a condition tha... | James Dong | 2010-06-16 | 1 | -1/+3 |
| |\ \ |
|
| | * | | When filling the cache, we always time out waiting for a condition that won't... | James Dong | 2010-06-16 | 1 | -1/+3 |
* | | | | am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free m... | Dave Sparks | 2010-06-17 | 1 | -0/+3 |
|\ \ \ \
| |/ / / |
|
| * | | | TimedEventQueue is apparently important for glitch-free media playback, and so | Marco Nelissen | 2010-06-16 | 1 | -0/+3 |
| |/ / |
|
* | | | am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to ... | Andreas Huber | 2010-06-03 | 1 | -12/+50 |
|\ \ \
| |/ / |
|
| * | | Merge "Changes to the prefetcher to allow for bursts of data to be transferre... | Andreas Huber | 2010-06-03 | 1 | -12/+50 |
| |\ \ |
|
| | * | | Changes to the prefetcher to allow for bursts of data to be transferred, hope... | Andreas Huber | 2010-06-03 | 1 | -12/+50 |
* | | | | am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should... | James Dong | 2010-06-03 | 1 | -2/+6 |
|\ \ \ \
| |/ / / |
|
| * | | | Fix a Javadoc to clarify when setAudioStreamType() should be called. | James Dong | 2010-06-03 | 1 | -2/+6 |
| |/ / |
|
* | | | am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress... | Yu Shan Emily Lau | 2010-05-25 | 3 | -20/+126 |
|\ \ \
| |/ / |
|
| * | | Added the runtime parameters for the mediarecorder stress test. | Yu Shan Emily Lau | 2010-05-25 | 3 | -20/+126 |
* | | | am 2723e092: Merge "Better handling of codec initialization failure in the pl... | Andreas Huber | 2010-05-20 | 3 | -5/+20 |
|\ \ \
| |/ / |
|
| * | | Better handling of codec initialization failure in the player and thumbnail e... | Andreas Huber | 2010-05-20 | 3 | -5/+20 |
* | | | merge from open-source master | The Android Open Source Project | 2010-05-17 | 2 | -1/+5 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge "Modified libdrm to support SuperH platform" | Jeff Hamilton | 2010-05-14 | 2 | -1/+5 |
| |\ \ |
|
| | * | | Modified libdrm to support SuperH platform | Shin-ichiro KAWASAKI | 2009-07-03 | 2 | -1/+5 |
* | | | | am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample t... | Andreas Huber | 2010-05-14 | 1 | -1/+2 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Fix sampleTable instantiation, this makes sure that the sample table refers t... | Andreas Huber | 2010-05-14 | 1 | -1/+2 |
* | | | | merge from open-source master | The Android Open Source Project | 2010-05-14 | 1 | -1/+1 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Merge "Accept media files by file extension in case insensitive manner." | Jean-Baptiste Queru | 2010-05-14 | 1 | -1/+1 |
| |\ \ \ |
|
| | * | | | Accept media files by file extension in case insensitive manner. | Atsushi Eno | 2010-03-19 | 1 | -1/+1 |
* | | | | | am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is... | Andreas Huber | 2010-05-13 | 2 | -3/+10 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | Return a runtime error instead of asserting if the AACDecoder is passed an un... | Andreas Huber | 2010-05-13 | 2 | -3/+10 |
* | | | | | am b1235a57: Merge "Hide two audio focus methods." into froyo | Xavier Ducrohet | 2010-05-12 | 1 | -0/+2 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Merge "Hide two audio focus methods." into froyo | Xavier Ducrohet | 2010-05-11 | 1 | -0/+2 |
| |\ \ \ \ |
|
| | * | | | | Hide two audio focus methods. | Xavier Ducrohet | 2010-05-11 | 1 | -0/+2 |
* | | | | | | am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, si... | Marco Nelissen | 2010-05-12 | 1 | -2/+5 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Don't clear the _data column in the audio_meta table, since it isn't | Marco Nelissen | 2010-05-11 | 1 | -2/+5 |
| |/ / / / |
|
* | | | | | am e0dc80f8: Merge "Support for customizable socket-read timeouts through the... | Andreas Huber | 2010-05-12 | 3 | -4/+33 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Merge "Support for customizable socket-read timeouts through the HTTP respons... | Andreas Huber | 2010-05-11 | 3 | -4/+33 |
| |\ \ \ \ |
|
| | * | | | | Support for customizable socket-read timeouts through the HTTP response. | Andreas Huber | 2010-05-11 | 3 | -4/+33 |
* | | | | | | am d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decod... | Andreas Huber | 2010-05-12 | 2 | -9/+22 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Merge "Better seek handling and proper reset of the vorbis decoder after a di... | Andreas Huber | 2010-05-11 | 2 | -9/+22 |
| |\ \ \ \ \ |
|
| | * | | | | | Better seek handling and proper reset of the vorbis decoder after a discontin... | Andreas Huber | 2010-05-11 | 2 | -9/+22 |
| | |/ / / / |
|
* | | | | | | am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide ... | Jean-Michel Trivi | 2010-05-12 | 1 | -9/+15 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Update javadoc in android.media.AudioManager to not hide the | Jean-Michel Trivi | 2010-05-11 | 1 | -9/+15 |
* | | | | | | am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects... | Jean-Michel Trivi | 2010-05-12 | 2 | -22/+25 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Fix bug 2670395 and 2599698 | Jean-Michel Trivi | 2010-05-11 | 2 | -22/+25 |
| |/ / / / |
|
* | | | | | am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approxi... | Andreas Huber | 2010-05-10 | 14 | -371/+964 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | A new OggExtractor/VorbisDecoder combo to support approximate seeking. | Andreas Huber | 2010-05-07 | 14 | -371/+964 |
* | | | | | am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into ... | Andreas Huber | 2010-05-06 | 8 | -5/+106 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Merge "Disable vorbis seek when streaming from localhost." into froyo | Andreas Huber | 2010-05-06 | 8 | -5/+106 |
| |\ \ \ \ |
|
| | * | | | | Disable vorbis seek when streaming from localhost. | Andreas Huber | 2010-05-06 | 8 | -5/+106 |
* | | | | | | am 2d315667: For issue #2651381, allow library prelinking. | Dan Bornstein | 2010-05-05 | 5 | -10/+0 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | For issue #2651381, allow library prelinking. | Dan Bornstein | 2010-05-05 | 5 | -10/+0 |
| |/ / / / |
|