James Dong 9fe05b7bc1 resolved conflicts for merge of 1cbf8493 to master ...

Change-Id: Ifea2ba8b02ecf291fbd1612973647a95a70511c4

2011-03-16 15:53:03 -07:00

..

Android.mk

Add memory leak tracking/debugging code to drm server

2011-03-14 18:48:19 -07:00

AudioEffect.cpp

Fix issue 3157123.

2010-11-19 15:49:42 -08:00

AudioRecord.cpp

Fix issue 3439872: video chat and bluetooth SCO

2011-03-08 16:33:15 -08:00

AudioSystem.cpp

Bug 3352047 Wrong message when adjusting volume

2011-02-10 14:37:42 -08:00

AudioTrack.cpp

Fix issue 3439872: video chat and bluetooth SCO

2011-03-08 16:33:15 -08:00

autodetect.cpp

…

autodetect.h

…

fixedfft.cpp

…

IAudioFlinger.cpp

Fix issue 3371080

2011-02-03 09:26:24 -08:00

IAudioFlingerClient.cpp

…

IAudioPolicyService.cpp

Bug 3352047 Wrong message when adjusting volume

2011-02-10 14:37:42 -08:00

IAudioRecord.cpp

…

IAudioTrack.cpp

…

IEffect.cpp

…

IEffectClient.cpp

…

IMediaDeathNotifier.cpp

…

IMediaMetadataRetriever.cpp

Squash commits of the following patches, cherry-picked from other branch - do not merge.

2011-01-12 17:12:46 -08:00

IMediaPlayer.cpp

Bug 3438258 Add SurfaceTexture as MediaPlayer sink

2011-02-23 15:02:56 -08:00

IMediaPlayerClient.cpp

…

IMediaPlayerService.cpp

- Add method in MediaPlayerService to collect and pull

2011-02-22 22:42:05 -08:00

IMediaRecorder.cpp

…

IMediaRecorderClient.cpp

…

IOMX.cpp

Add an OMX IL API for querying buffer usage flags.

2011-02-28 12:12:20 -08:00

IStreamSource.cpp

Allow optional specification of a PTS timestamp when signalling a discontinuity.

2011-03-02 15:38:32 -08:00

JetPlayer.cpp

…

mediametadataretriever.cpp

Squash commits of the following patches, cherry-picked from other branch - do not merge.

2011-01-12 17:12:46 -08:00

mediaplayer.cpp

Bug 3438258 Add SurfaceTexture as MediaPlayer sink

2011-02-23 15:02:56 -08:00

MediaProfiles.cpp

Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.

2011-03-16 14:11:32 -07:00

mediarecorder.cpp

Check file descriptor before passing it through binder calls

2011-02-22 12:34:02 -08:00

MediaScanner.cpp

MediaScanner: Add support for scanning empty directories

2010-12-16 15:35:36 -08:00

MediaScannerClient.cpp

…

MemoryLeakTrackUtil.cpp

Add memory leak tracking/debugging code to drm server

2011-03-14 18:48:19 -07:00

Metadata.cpp

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

ToneGenerator.cpp

…

Visualizer.cpp

Increase the number of useful bits in the spectrum.

2011-01-24 08:47:55 -08:00