summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2012-01-05 23:27:52 +0000
committerSteve Block <steveblock@google.com>2012-01-05 23:27:52 +0000
commit3fb19cd0b6534ef9d36f8ac0c5ddbdc73ed92a26 (patch)
treed87e57ab48b0736302e3854cf38c65091e98709e
parent5a182ec3e8b87b6538b4b492cb993239a677915f (diff)
downloadmsm7k-3fb19cd0b6534ef9d36f8ac0c5ddbdc73ed92a26.tar.gz
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I367c22b5c3a9f5796feddb14923063db015ae957
-rw-r--r--libaudio-qdsp5v2/AudioHardware.cpp4
-rw-r--r--libaudio-qdsp5v2/AudioPolicyManager.cpp2
-rw-r--r--libaudio-qsd8k/AudioHardware.cpp28
-rw-r--r--libaudio-qsd8k/AudioPolicyManager.cpp2
-rw-r--r--libaudio/AudioHardware.cpp18
-rw-r--r--libcamera/QualcommCameraHardware.cpp10
-rw-r--r--libgralloc-qsd8k/framebuffer.cpp4
-rw-r--r--libgralloc-qsd8k/pmemalloc.cpp2
-rw-r--r--libgralloc/framebuffer.cpp4
-rw-r--r--libgralloc/gralloc.cpp2
10 files changed, 38 insertions, 38 deletions
diff --git a/libaudio-qdsp5v2/AudioHardware.cpp b/libaudio-qdsp5v2/AudioHardware.cpp
index 0f42751..e44c945 100644
--- a/libaudio-qdsp5v2/AudioHardware.cpp
+++ b/libaudio-qdsp5v2/AudioHardware.cpp
@@ -91,7 +91,7 @@ AudioStreamOut* AudioHardware::openOutputStream(
void AudioHardware::closeOutputStream(AudioStreamOut* out) {
Mutex::Autolock lock(mLock);
if (mOutput == 0 || mOutput != out) {
- LOGW("Attempt to close invalid output stream");
+ ALOGW("Attempt to close invalid output stream");
}
else {
delete mOutput;
@@ -278,7 +278,7 @@ ssize_t AudioHardware::AudioStreamOutQ5V2::write(const void* buffer, size_t byte
} else {
if (errno != EAGAIN) return written;
mRetryCount++;
- LOGW("EAGAIN - retry");
+ ALOGW("EAGAIN - retry");
}
}
diff --git a/libaudio-qdsp5v2/AudioPolicyManager.cpp b/libaudio-qdsp5v2/AudioPolicyManager.cpp
index 79231f3..29c7052 100644
--- a/libaudio-qdsp5v2/AudioPolicyManager.cpp
+++ b/libaudio-qdsp5v2/AudioPolicyManager.cpp
@@ -225,7 +225,7 @@ uint32_t AudioPolicyManager::getDeviceForStrategy(routing_strategy strategy, boo
} break;
default:
- LOGW("getDeviceForStrategy() unknown strategy: %d", strategy);
+ ALOGW("getDeviceForStrategy() unknown strategy: %d", strategy);
break;
}
diff --git a/libaudio-qsd8k/AudioHardware.cpp b/libaudio-qsd8k/AudioHardware.cpp
index 457b433..b935912 100644
--- a/libaudio-qsd8k/AudioHardware.cpp
+++ b/libaudio-qsd8k/AudioHardware.cpp
@@ -252,7 +252,7 @@ AudioStreamOut* AudioHardware::openOutputStream(
void AudioHardware::closeOutputStream(AudioStreamOut* out) {
Mutex::Autolock lock(mLock);
if (mOutput == 0 || mOutput != out) {
- LOGW("Attempt to close invalid output stream");
+ ALOGW("Attempt to close invalid output stream");
}
else {
delete mOutput;
@@ -293,7 +293,7 @@ void AudioHardware::closeInputStream(AudioStreamIn* in) {
ssize_t index = mInputs.indexOf((AudioStreamInMSM72xx *)in);
if (index < 0) {
- LOGW("Attempt to close invalid input stream");
+ ALOGW("Attempt to close invalid input stream");
} else {
mLock.unlock();
delete mInputs[index];
@@ -451,7 +451,7 @@ status_t AudioHardware::setParameters(const String8& keyValuePairs)
if (noiseSuppressionState != mNoiseSuppressionState) {
if (!mA1026Init) {
- LOGW("Audience A1026 not initialized.\n");
+ ALOGW("Audience A1026 not initialized.\n");
return INVALID_OPERATION;
}
@@ -577,15 +577,15 @@ size_t AudioHardware::getBufferSize(uint32_t sampleRate, int channelCount)
size_t AudioHardware::getInputBufferSize(uint32_t sampleRate, int format, int channelCount)
{
if (format != AudioSystem::PCM_16_BIT) {
- LOGW("getInputBufferSize bad format: %d", format);
+ ALOGW("getInputBufferSize bad format: %d", format);
return 0;
}
if (channelCount < 1 || channelCount > 2) {
- LOGW("getInputBufferSize bad channel count: %d", channelCount);
+ ALOGW("getInputBufferSize bad channel count: %d", channelCount);
return 0;
}
if (sampleRate < 8000 || sampleRate > 48000) {
- LOGW("getInputBufferSize bad sample rate: %d", sampleRate);
+ ALOGW("getInputBufferSize bad sample rate: %d", sampleRate);
return 0;
}
@@ -603,7 +603,7 @@ static status_t set_volume_rpc(uint32_t volume)
volume *= 20; //percentage
ALOGD("Setting in-call volume to %d\n", volume);
if (ioctl(fd, AUDIO_SET_VOLUME, &volume)) {
- LOGW("Cannot set volume on current device\n");
+ ALOGW("Cannot set volume on current device\n");
}
close(fd);
return NO_ERROR;
@@ -612,10 +612,10 @@ static status_t set_volume_rpc(uint32_t volume)
status_t AudioHardware::setVoiceVolume(float v)
{
if (v < 0.0) {
- LOGW("setVoiceVolume(%f) under 0.0, assuming 0.0", v);
+ ALOGW("setVoiceVolume(%f) under 0.0, assuming 0.0", v);
v = 0.0;
} else if (v > 1.0) {
- LOGW("setVoiceVolume(%f) over 1.0, assuming 1.0", v);
+ ALOGW("setVoiceVolume(%f) over 1.0, assuming 1.0", v);
v = 1.0;
}
@@ -952,7 +952,7 @@ status_t AudioHardware::doA1026_init(void)
}
else if (!nr) {
if (remaining)
- LOGW("EOF reading firmware %s while %d bytes remain\n",
+ ALOGW("EOF reading firmware %s while %d bytes remain\n",
fn, remaining);
break;
}
@@ -1110,7 +1110,7 @@ status_t AudioHardware::doAudience_A1026_Control(int Mode, bool Record, uint32_t
int retry = 4;
if (!mA1026Init) {
- LOGW("Audience A1026 not initialized.\n");
+ ALOGW("Audience A1026 not initialized.\n");
return NO_INIT;
}
@@ -1125,7 +1125,7 @@ status_t AudioHardware::doAudience_A1026_Control(int Mode, bool Record, uint32_t
}
if ((Mode < AudioSystem::MODE_CURRENT) || (Mode >= AudioSystem::NUM_MODES)) {
- LOGW("Illegal value: doAudience_A1026_Control(%d, %u, %u)", Mode, Record, Routes);
+ ALOGW("Illegal value: doAudience_A1026_Control(%d, %u, %u)", Mode, Record, Routes);
mA1026Lock.unlock();
return BAD_VALUE;
}
@@ -1302,7 +1302,7 @@ status_t AudioHardware::doAudience_A1026_Control(int Mode, bool Record, uint32_t
} while (--retry);
if (rc < 0) {
- LOGW("A1026 do hard reset to recover from error!\n");
+ ALOGW("A1026 do hard reset to recover from error!\n");
rc = doA1026_init(); /* A1026 needs to do hard reset! */
if (!rc) {
/* after doA1026_init(), fd_a1026 is -1*/
@@ -1408,7 +1408,7 @@ status_t AudioHardware::doRouting()
if (sndDevice == -1) {
if (outputDevices & (outputDevices - 1)) {
if ((outputDevices & AudioSystem::DEVICE_OUT_SPEAKER) == 0) {
- LOGW("Hardware does not support requested route combination (%#X),"
+ ALOGW("Hardware does not support requested route combination (%#X),"
" picking closest possible route...", outputDevices);
}
}
diff --git a/libaudio-qsd8k/AudioPolicyManager.cpp b/libaudio-qsd8k/AudioPolicyManager.cpp
index 120eaca..d3bd0ce 100644
--- a/libaudio-qsd8k/AudioPolicyManager.cpp
+++ b/libaudio-qsd8k/AudioPolicyManager.cpp
@@ -225,7 +225,7 @@ uint32_t AudioPolicyManager::getDeviceForStrategy(routing_strategy strategy, boo
} break;
default:
- LOGW("getDeviceForStrategy() unknown strategy: %d", strategy);
+ ALOGW("getDeviceForStrategy() unknown strategy: %d", strategy);
break;
}
diff --git a/libaudio/AudioHardware.cpp b/libaudio/AudioHardware.cpp
index c13f142..5a20f00 100644
--- a/libaudio/AudioHardware.cpp
+++ b/libaudio/AudioHardware.cpp
@@ -186,7 +186,7 @@ AudioStreamOut* AudioHardware::openOutputStream(
void AudioHardware::closeOutputStream(AudioStreamOut* out) {
Mutex::Autolock lock(mLock);
if (mOutput == 0 || mOutput != out) {
- LOGW("Attempt to close invalid output stream");
+ ALOGW("Attempt to close invalid output stream");
}
else {
delete mOutput;
@@ -227,7 +227,7 @@ void AudioHardware::closeInputStream(AudioStreamIn* in) {
ssize_t index = mInputs.indexOf((AudioStreamInMSM72xx *)in);
if (index < 0) {
- LOGW("Attempt to close invalid input stream");
+ ALOGW("Attempt to close invalid input stream");
} else {
mLock.unlock();
delete mInputs[index];
@@ -346,11 +346,11 @@ static unsigned calculate_audpre_table_index(unsigned index)
size_t AudioHardware::getInputBufferSize(uint32_t sampleRate, int format, int channelCount)
{
if (format != AudioSystem::PCM_16_BIT) {
- LOGW("getInputBufferSize bad format: %d", format);
+ ALOGW("getInputBufferSize bad format: %d", format);
return 0;
}
if (channelCount < 1 || channelCount > 2) {
- LOGW("getInputBufferSize bad channel count: %d", channelCount);
+ ALOGW("getInputBufferSize bad channel count: %d", channelCount);
return 0;
}
@@ -399,10 +399,10 @@ static status_t set_volume_rpc(uint32_t device,
status_t AudioHardware::setVoiceVolume(float v)
{
if (v < 0.0) {
- LOGW("setVoiceVolume(%f) under 0.0, assuming 0.0\n", v);
+ ALOGW("setVoiceVolume(%f) under 0.0, assuming 0.0\n", v);
v = 0.0;
} else if (v > 1.0) {
- LOGW("setVoiceVolume(%f) over 1.0, assuming 1.0\n", v);
+ ALOGW("setVoiceVolume(%f) over 1.0, assuming 1.0\n", v);
v = 1.0;
}
@@ -535,7 +535,7 @@ status_t AudioHardware::doRouting()
if (sndDevice == -1) {
if (outputDevices & (outputDevices - 1)) {
if ((outputDevices & AudioSystem::DEVICE_OUT_SPEAKER) == 0) {
- LOGW("Hardware does not support requested route combination (%#X),"
+ ALOGW("Hardware does not support requested route combination (%#X),"
" picking closest possible route...", outputDevices);
}
}
@@ -757,7 +757,7 @@ ssize_t AudioHardware::AudioStreamOutMSM72xx::write(const void* buffer, size_t b
} else {
if (errno != EAGAIN) return written;
mRetryCount++;
- LOGW("EAGAIN - retry");
+ ALOGW("EAGAIN - retry");
}
}
@@ -1039,7 +1039,7 @@ ssize_t AudioHardware::AudioStreamInMSM72xx::read( void* buffer, ssize_t bytes)
} else {
if (errno != EAGAIN) return bytesRead;
mRetryCount++;
- LOGW("EAGAIN - retrying");
+ ALOGW("EAGAIN - retrying");
}
}
return bytes;
diff --git a/libcamera/QualcommCameraHardware.cpp b/libcamera/QualcommCameraHardware.cpp
index fded299..f0c5fd2 100644
--- a/libcamera/QualcommCameraHardware.cpp
+++ b/libcamera/QualcommCameraHardware.cpp
@@ -1377,7 +1377,7 @@ namespace android {
} \
} \
else { \
- LOGW("receiveRawPicture: GPS " #what " not specified: " \
+ ALOGW("receiveRawPicture: GPS " #what " not specified: " \
"defaulting to zero in EXIF header."); \
encode_location = false; \
} \
@@ -1663,13 +1663,13 @@ namespace android {
int th_w, th_h, th_q;
th_w = mParameters.getInt("jpeg-thumbnail-width");
- if (th_w < 0) LOGW("property jpeg-thumbnail-width not specified");
+ if (th_w < 0) ALOGW("property jpeg-thumbnail-width not specified");
th_h = mParameters.getInt("jpeg-thumbnail-height");
- if (th_h < 0) LOGW("property jpeg-thumbnail-height not specified");
+ if (th_h < 0) ALOGW("property jpeg-thumbnail-height not specified");
th_q = mParameters.getInt("jpeg-thumbnail-quality");
- if (th_q < 0) LOGW("property jpeg-thumbnail-quality not specified");
+ if (th_q < 0) ALOGW("property jpeg-thumbnail-quality not specified");
if (th_w > 0 && th_h > 0 && th_q > 0) {
ALOGI("setting thumbnail dimensions to %dx%d, quality %d",
@@ -1684,7 +1684,7 @@ namespace android {
/* Set Default JPEG encoding--this does not cause a callback */
encode_properties.quality = mParameters.getInt("jpeg-quality");
if (encode_properties.quality < 0) {
- LOGW("JPEG-image quality is not specified "
+ ALOGW("JPEG-image quality is not specified "
"or is negative, defaulting to %d",
encode_properties.quality);
encode_properties.quality = 100;
diff --git a/libgralloc-qsd8k/framebuffer.cpp b/libgralloc-qsd8k/framebuffer.cpp
index df167f3..45a418c 100644
--- a/libgralloc-qsd8k/framebuffer.cpp
+++ b/libgralloc-qsd8k/framebuffer.cpp
@@ -238,14 +238,14 @@ int mapFrameBufferLocked(struct private_module_t* module)
if (ioctl(fd, FBIOPUT_VSCREENINFO, &info) == -1) {
info.yres_virtual = info.yres;
flags &= ~PAGE_FLIP;
- LOGW("FBIOPUT_VSCREENINFO failed, page flipping not supported");
+ ALOGW("FBIOPUT_VSCREENINFO failed, page flipping not supported");
}
if (info.yres_virtual < info.yres * 2) {
// we need at least 2 for page-flipping
info.yres_virtual = info.yres;
flags &= ~PAGE_FLIP;
- LOGW("page flipping not supported (yres_virtual=%d, requested=%d)",
+ ALOGW("page flipping not supported (yres_virtual=%d, requested=%d)",
info.yres_virtual, info.yres*2);
}
diff --git a/libgralloc-qsd8k/pmemalloc.cpp b/libgralloc-qsd8k/pmemalloc.cpp
index 5bada4a..895e53d 100644
--- a/libgralloc-qsd8k/pmemalloc.cpp
+++ b/libgralloc-qsd8k/pmemalloc.cpp
@@ -310,7 +310,7 @@ int PmemKernelAllocator::free_pmem_buffer(size_t size, void* base, int offset, i
int err = deps.munmap(base, size);
if (err < 0) {
err = deps.getErrno();
- LOGW("%s: error unmapping pmem fd: %s", pmemdev, strerror(err));
+ ALOGW("%s: error unmapping pmem fd: %s", pmemdev, strerror(err));
return -err;
}
END_FUNC;
diff --git a/libgralloc/framebuffer.cpp b/libgralloc/framebuffer.cpp
index 4acc89f..b27f0d9 100644
--- a/libgralloc/framebuffer.cpp
+++ b/libgralloc/framebuffer.cpp
@@ -202,14 +202,14 @@ int mapFrameBufferLocked(struct private_module_t* module)
if (ioctl(fd, FBIOPUT_VSCREENINFO, &info) == -1) {
info.yres_virtual = info.yres;
flags &= ~PAGE_FLIP;
- LOGW("FBIOPUT_VSCREENINFO failed, page flipping not supported");
+ ALOGW("FBIOPUT_VSCREENINFO failed, page flipping not supported");
}
if (info.yres_virtual < info.yres * 2) {
// we need at least 2 for page-flipping
info.yres_virtual = info.yres;
flags &= ~PAGE_FLIP;
- LOGW("page flipping not supported (yres_virtual=%d, requested=%d)",
+ ALOGW("page flipping not supported (yres_virtual=%d, requested=%d)",
info.yres_virtual, info.yres*2);
}
diff --git a/libgralloc/gralloc.cpp b/libgralloc/gralloc.cpp
index fdf0e85..894b51b 100644
--- a/libgralloc/gralloc.cpp
+++ b/libgralloc/gralloc.cpp
@@ -409,7 +409,7 @@ try_ashmem:
offset = sAllocatorGPU.allocate(size);
if (offset < 0) {
// no more pmem memory
- LOGW("%d KiB allocation failed in GPU memory, retrying...",
+ ALOGW("%d KiB allocation failed in GPU memory, retrying...",
size/1024);
err = -ENOMEM;
sleeptime += 250000;