Eric Laurent b388138ff2 resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp ...

Change-Id: Ia7e1cd869779e9f512e840b768f5b43992c8a122

2012-03-16 17:19:25 -07:00

..

Android.mk

Remove the simulator target from all makefiles.

2011-07-11 22:12:16 -07:00

AudioEffect.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

AudioParameter.cpp

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)

2012-01-19 14:44:31 -08:00

AudioRecord.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

AudioSystem.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

AudioTrack.cpp

resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp

2012-03-16 17:19:25 -07:00

autodetect.cpp

…

autodetect.h

…

fixedfft.cpp

…

IAudioFlinger.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

IAudioFlingerClient.cpp

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)

2012-01-19 14:44:31 -08:00

IAudioPolicyService.cpp

Audio effects: track CPU and memory use separately

2011-08-11 14:33:45 -07:00

IAudioRecord.cpp

Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)

2012-01-19 14:44:59 -08:00

IAudioTrack.cpp

Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)

2012-01-19 14:44:59 -08:00

IEffect.cpp

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)

2012-01-19 14:44:31 -08:00

IEffectClient.cpp

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)

2012-01-19 14:44:31 -08:00

IMediaDeathNotifier.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

IMediaMetadataRetriever.cpp

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)

2012-01-19 14:44:31 -08:00

IMediaPlayer.cpp

Remove surface legacy APIs and code.

2011-10-28 09:39:23 -07:00

IMediaPlayerClient.cpp

…

IMediaPlayerService.cpp

Require INTERNET permission for network-based content.

2011-09-02 11:26:59 +01:00

IMediaRecorder.cpp

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)

2012-01-19 14:44:31 -08:00

IMediaRecorderClient.cpp

…

IOMX.cpp

Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)

2012-01-19 14:44:59 -08:00

IStreamSource.cpp

Updated (internal) API for IStreamSource to signal discontinuities

2011-11-29 11:59:10 -08:00

JetPlayer.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

mediametadataretriever.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

mediaplayer.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

MediaProfiles.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

mediarecorder.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

MediaScanner.cpp

Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)

2012-01-19 14:44:59 -08:00

MediaScannerClient.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

MemoryLeakTrackUtil.cpp

…

Metadata.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

ToneGenerator.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00

Visualizer.cpp

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

2012-01-19 14:45:03 -08:00