summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 162c9d0e: Merge change 2805 into donutAndroid (Google) Code Review2009-06-011-1/+1
|\
| * Merge change 2805 into donutAndroid (Google) Code Review2009-06-011-1/+1
| |\
| | * base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGESan Mehat2009-06-011-1/+1
* | | am 450ad31b: Merge change 2774 into donutAndroid (Google) Code Review2009-06-011-6/+10
|\ \ \ | |/ /
| * | Merge change 2774 into donutAndroid (Google) Code Review2009-06-011-6/+10
| |\ \ | | |/ | |/|
| | * Limit check on maxChannels for SoundPool.Dave Sparks2009-06-011-6/+10
* | | get rid of utils.hMathias Agopian2009-05-312-2/+8
* | | am 0f5179c7: Merge change 2716 into donutAndroid (Google) Code Review2009-05-292-8/+34
|\ \ \ | |/ /
| * | Merge change 2716 into donutAndroid (Google) Code Review2009-05-292-8/+34
| |\ \
| | * | Update MediaPlayer to allow setVideoSurface calls after prepare. Also allowDave Sparks2009-05-292-8/+34
| | |/
* | | am f6355e24: Merge change 2399 into donutAndroid (Google) Code Review2009-05-281-40/+279
|\ \ \ | |/ /
| * | Merge change 2399 into donutAndroid (Google) Code Review2009-05-281-40/+279
| |\ \
| | * | Motorola additions for CDMA support without CdmaSuppConnTrackerWink Saville2009-05-281-40/+279
| | |/
* | | am 2af7e639: Merge change 2654 into donutAndroid (Google) Code Review2009-05-281-9/+97
|\ \ \ | |/ /
| * | Added the two validations for the memory stress testYu Shan Emily Lau2009-05-281-9/+97
| |/
* | am f3288f17: Merge change 2468 into donutAndroid (Google) Code Review2009-05-261-0/+2
|\ \ | |/
| * setVolume did not check interface descriptorDave Sparks2009-05-261-0/+2
* | some work to try to reduce the code size of some native librariesMathias Agopian2009-05-269-54/+0
* | am de8268d6: Merge change 2331 into donutAndroid (Google) Code Review2009-05-265-21/+36
|\ \ | |/
| * Fix issue 1846343 - part 1Eric Laurent2009-05-265-21/+36
* | am c1c82509: Merge change 2163 into donutAndroid (Google) Code Review2009-05-201-0/+4
|\ \ | |/
| * Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorderDave Sparks2009-05-201-0/+4
* | move libbinder's header files under includes/binderMathias Agopian2009-05-2021-42/+42
* | checkpoint: split libutils into libutils + libbinderMathias Agopian2009-05-205-2/+6
* | am 379d3bd9: Merge change 2016 into donutAndroid (Google) Code Review2009-05-195-39/+39
|\ \ | |/
| * Merge change 2016 into donutAndroid (Google) Code Review2009-05-195-39/+39
| |\
| | * Replaced the old test media files with the new open source test media files.Yu Shan Emily Lau2009-05-195-39/+39
* | | am 988c4d1a: Merge change 2005 into donutAndroid (Google) Code Review2009-05-191-0/+1
|\ \ \ | |/ /
| * | Added the write sdcard permission so that the mediarecorder testYu Shan Emily Lau2009-05-191-0/+1
| |/
* | am 65ff54c4: Merge change 1967 into donutAndroid (Google) Code Review2009-05-191-1/+39
|\ \ | |/
| * Document the media scanner's flow through native and java code, sinceMarco Nelissen2009-05-191-1/+39
* | am b3af6b48: Merge change 1748 into donutAndroid (Google) Code Review2009-05-153-6/+103
|\ \ | |/
| * Add a tool to play all kinds of media files saved in /sdcard/media_api/sampl...Xia Wang2009-05-153-6/+103
* | am 109b21ba: Merge change 1677 into donutAndroid (Google) Code Review2009-05-143-8/+5
|\ \ | |/
| * Findbugs fixes.Marco Nelissen2009-05-143-8/+5
* | am 7f2ae49: Merge change 1370 into donutAndroid (Google) Code Review2009-05-111-0/+5
|\ \ | |/
| * Merge change 1370 into donutAndroid (Google) Code Review2009-05-111-0/+5
| |\
| | * Fix a JNI layer crash due to null camera object passed to get_native_camera()James Dong2009-05-111-0/+5
* | | am b85c374: Merge change 1155 into donutAndroid (Google) Code Review2009-05-071-1/+1
|\ \ \ | |/ /
| * | Merge change 1155 into donutAndroid (Google) Code Review2009-05-071-1/+1
| |\ \ | | |/ | |/|
| | * Don't allow negative numbers in ToneGenerator toneType parameterDave Sparks2009-05-071-1/+1
* | | am 0efb086: Merge change 1120 into donutAndroid (Google) Code Review2009-05-072-3/+13
|\ \ \ | |/ /
| * | Merge change 1120 into donutAndroid (Google) Code Review2009-05-072-3/+13
| |\ \ | | |/ | |/|
| | * Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTestXia Wang2009-05-062-3/+13
* | | am a6706b3: Merge change 1131 into donutAndroid (Google) Code Review2009-05-071-1/+4
|\ \ \ | |/ /
| * | fix issue 1641535: SoundPool should use AudioTrack with shared memory bufferEric Laurent2009-05-071-1/+4
| |/
* | manual merge f3af740bdfc261b1cb25c0799af780d3753d4518The Android Open Source Project2009-05-063-94/+413
|\ \ | |/
| * Fixed issue 1709450: Requirements for CDMA Tone GeneratorEric Laurent2009-05-063-94/+413
* | manual merge for b9c9d260f21b321527c4622a123af9767630d94dThe Android Open Source Project2009-05-062-36/+217
|\ \ | |/
| * fix issue 1713090: After a Bluetooth call, MusicPlayer starts playing on spea...Eric Laurent2009-05-062-36/+217