summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 2f8d58b7: Merge change 5420 into donutAndroid (Google) Code Review2009-07-013-0/+140
|\
| * Merge change 5420 into donutAndroid (Google) Code Review2009-06-303-0/+140
| |\
| | * Added two test cases to trace the failure in closing the hw decoder and the c...Yu Shan Emily Lau2009-06-303-0/+140
* | | am 2d9f3169: Merge change 5595 into donutAndroid (Google) Code Review2009-06-291-6/+6
|\ \ \ | |/ /
| * | We might try to close the Vorbis file twice under certainDave Sparks2009-06-261-6/+6
| |/
* | am 3d7b8d1a: Merge change 5158 into donutAndroid (Google) Code Review2009-06-241-1/+1
|\ \ | |/
| * Use a ref-counted callback interface for Camera.Dave Sparks2009-06-241-1/+1
* | am 9efba9d2: Merge change 5176 into donutAndroid (Google) Code Review2009-06-241-3/+46
|\ \ | |/
| * Merge change 5176 into donutAndroid (Google) Code Review2009-06-231-3/+46
| |\
| | * Export the output to a text file and save to sdcardYu Shan Emily Lau2009-06-231-3/+46
* | | Direct api to the native media player.Nicolas Catania2009-06-2410-5/+122
* | | am 1bee98af: Merge change 5100 into donutAndroid (Google) Code Review2009-06-232-303/+1146
|\ \ \ | |/ /
| * | Merge change 5100 into donutAndroid (Google) Code Review2009-06-232-303/+1146
| |\ \
| | * | Fill in CDMA gaps and clean up ToneGenerator codeDavid Krause2009-06-232-303/+1146
| | |/
* | | am 843f5eb3: Merge change 5054 into donutAndroid (Google) Code Review2009-06-231-2/+2
|\ \ \ | |/ /
| * | Rollback the number of loop in the memory stress testYu Shan Emily Lau2009-06-221-2/+2
| |/
* | am 11348cff: Merge change 4885 into donutAndroid (Google) Code Review2009-06-221-39/+47
|\ \ | |/
| * Merge the output file into one.Yu Shan Emily Lau2009-06-221-39/+47
* | Renamed all android.hardware.IMedia* strings to android.media.IMedia*niko2009-06-225-8/+5
* | am 0e3d77af: Merge change 4324 into donutAndroid (Google) Code Review2009-06-161-4/+4
|\ \ | |/
| * AudioService: Fix routing problem recently introduced in setRouting().Mike Lockwood2009-06-161-4/+4
* | am 3d4b7065: Merge change 4047 into donutAndroid (Google) Code Review2009-06-121-18/+35
|\ \ | |/
| * Merge change 4047 into donutAndroid (Google) Code Review2009-06-121-18/+35
| |\
| | * Fix issue #899198 MODE_RINGER_STREAMS_AFFECTED does not restore volumes corre...Eric Laurent2009-06-121-18/+35
* | | am d670b8c6: Merge change 3981 into donutAndroid (Google) Code Review2009-06-124-186/+185
|\ \ \ | |/ /
| * | Removed trailing whitespaces.Nicolas Catania2009-06-114-186/+185
| |/
* | am 1d7d5db7: Merge change 3799 into donutAndroid (Google) Code Review2009-06-101-7/+1
|\ \ | |/
| * Merge change 3799 into donutAndroid (Google) Code Review2009-06-101-7/+1
| |\
| | * Turned on the windows media related test cases as the binary already integrated.Yu Shan Emily Lau2009-06-101-7/+1
* | | am faf41044: Merge change 3644 into donutAndroid (Google) Code Review2009-06-091-0/+1
|\ \ \ | |/ /
| * | Print a message to the log when a file can't be opened on the client side.Marco Nelissen2009-06-091-0/+1
| |/
* | am b2df1699: Merge change 1548 into donutAndroid (Google) Code Review2009-06-083-12/+105
|\ \ | |/
| * Merge change 1548 into donutAndroid (Google) Code Review2009-06-083-12/+105
| |\
| | * NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC).Jianhong Jiang2009-06-083-12/+105
* | | am bdf90a08: Merge change 3462 into donutAndroid (Google) Code Review2009-06-081-0/+7
|\ \ \ | |/ /
| * | Capture the memory output before the playback and record start.Yu Shan Emily Lau2009-06-081-0/+7
| |/
* | 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
|\ \ \ | |/ /