Andreas Huber ee9c3dbdd0 resolved conflicts for merge of 71c908c4 to master ...

Change-Id: I5a462c8e8ee0acfe2cecbfd58cb9aa2b360da047

2010-09-01 15:53:26 -07:00

..

audioeffect

Audio effects: modified command() parameter types.

2010-07-28 05:49:21 -07:00

soundpool

Add a name to the previously-unnamed thread created by SoundPoolThread.

2010-03-11 13:59:54 -08:00

android_media_AmrInputStream.cpp

AmrInputStream refresh: eliminate the dependency upon OpenCore's code

2010-06-18 18:56:54 -07:00

android_media_MediaMetadataRetriever.cpp

Use local lock for most MediaMetadataRetriever methods. Bug 2560834.

2010-04-01 18:08:22 -07:00

android_media_MediaPlayer.cpp

resolved conflicts for merge of 71c908c4 to master

2010-09-01 15:53:26 -07:00

android_media_MediaProfiles.cpp

Add multiple camera support for in MediaProfiles.

2010-07-01 10:57:15 +08:00

android_media_MediaRecorder.cpp

Added setAuxiliaryOutputFile to MediaRecorder and JNI

2010-08-31 10:38:49 -07:00

android_media_MediaScanner.cpp

Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.

2010-06-23 16:40:57 -07:00

android_media_MtpClient.cpp

MTP host: Add support for reading files from an MTP device via ParcelFileDescriptor

2010-07-26 20:40:45 -04:00

android_media_MtpCursor.cpp

Exclude MTP implementation from simulator build

2010-07-15 15:27:38 -04:00

android_media_MtpDatabase.cpp

MTP: Send an Intent after an MTP session that resulted in media database modifications

2010-08-31 16:25:12 -04:00

android_media_MtpServer.cpp

Add settings option for running MTP server in PTP mode.

2010-08-31 14:35:23 -04:00

android_media_ResampleInputStream.cpp

Fix for the safty check. It checks that nFir21 + jNpoints <= BUF_SIZE,

2010-02-22 15:59:03 -08:00

Android.mk

resolved conflicts for merge of 71c908c4 to master

2010-09-01 15:53:26 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…