LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE"

Browse Source
This commit is contained in:
Steve Block
2012-01-06 10:30:47 -08:00
committed by Android (Google) Code Review
parent b620cf22eb 6aff44c27e
commit 8e822bd462
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/emulator/opengl/system/egl/egl.cpp
View File

@@ -819,14 +819,14 @@ EGLBoolean eglReleaseThread()
EGLSurface eglCreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list)
{
//TODO
LOGW("%s not implemented", __FUNCTION__);
ALOGW("%s not implemented", __FUNCTION__);
return 0;
}
EGLBoolean eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value)
{
//TODO
LOGW("%s not implemented", __FUNCTION__);
ALOGW("%s not implemented", __FUNCTION__);
return 0;
}
@@ -864,7 +864,7 @@ EGLBoolean eglBindTexImage(EGLDisplay dpy, EGLSurface eglSurface, EGLint buffer)
EGLBoolean eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
{
//TODO
LOGW("%s not implemented", __FUNCTION__);
ALOGW("%s not implemented", __FUNCTION__);
return 0;
}

4
tools/emulator/system/camera/EmulatedCamera.cpp
View File

@@ -381,7 +381,7 @@ status_t EmulatedCamera::takePicture()
* enabled. */
EmulatedCameraDevice* const camera_dev = getCameraDevice();
if (camera_dev->isStarted()) {
LOGW("%s: Camera device is started", __FUNCTION__);
ALOGW("%s: Camera device is started", __FUNCTION__);
camera_dev->stopDeliveringFrames();
camera_dev->stopDevice();
}
@@ -1035,7 +1035,7 @@ static void PrintParamDiff(const CameraParameters& current,
ALOGD("+++ New parameter: %s=%s", tmp, val);
}
} else {
LOGW("No value separator in %s", tmp);
ALOGW("No value separator in %s", tmp);
}
wrk = next + 1;
next = strchr(wrk, ';');

10
tools/emulator/system/camera/EmulatedCameraDevice.cpp
View File

@@ -65,7 +65,7 @@ EmulatedCameraDevice::~EmulatedCameraDevice()
status_t EmulatedCameraDevice::Initialize()
{
if (isInitialized()) {
LOGW("%s: Emulated camera device is already initialized: mState = %d",
ALOGW("%s: Emulated camera device is already initialized: mState = %d",
__FUNCTION__, mState);
return NO_ERROR;
}
@@ -102,7 +102,7 @@ status_t EmulatedCameraDevice::stopDeliveringFrames()
ALOGV("%s", __FUNCTION__);
if (!isStarted()) {
LOGW("%s: Device is not started", __FUNCTION__);
ALOGW("%s: Device is not started", __FUNCTION__);
return NO_ERROR;
}
@@ -115,7 +115,7 @@ void EmulatedCameraDevice::setExposureCompensation(const float ev) {
ALOGV("%s", __FUNCTION__);
if (!isStarted()) {
LOGW("%s: Fake camera device is not started.", __FUNCTION__);
ALOGW("%s: Fake camera device is not started.", __FUNCTION__);
}
mExposureCompensation = std::pow(2.0f, ev / GAMMA_CORRECTION);
@@ -287,7 +287,7 @@ status_t EmulatedCameraDevice::WorkerThread::readyToRun()
{
ALOGV("Starting emulated camera device worker thread...");
LOGW_IF(mThreadControl >= 0 || mControlFD >= 0,
ALOGW_IF(mThreadControl >= 0 || mControlFD >= 0,
"%s: Thread control FDs are opened", __FUNCTION__);
/* Create a pair of FDs that would be used to control the thread. */
int thread_fds[2];
@@ -388,7 +388,7 @@ EmulatedCameraDevice::WorkerThread::Select(int fd, int timeout)
}
} else {
/* Must be an FD. */
LOGW_IF(fd < 0 || !FD_ISSET(fd, fds), "%s: Undefined 'select' result",
ALOGW_IF(fd < 0 || !FD_ISSET(fd, fds), "%s: Undefined 'select' result",
__FUNCTION__);
return READY;
}

2
tools/emulator/system/camera/EmulatedCameraDevice.h
View File

@@ -372,7 +372,7 @@ protected:
inline ~WorkerThread()
{
LOGW_IF(mThreadControl >= 0 || mControlFD >= 0,
ALOGW_IF(mThreadControl >= 0 || mControlFD >= 0,
"%s: Control FDs are opened in the destructor",
__FUNCTION__);
if (mThreadControl >= 0) {

2
tools/emulator/system/camera/EmulatedCameraFactory.cpp
View File

@@ -296,7 +296,7 @@ void EmulatedCameraFactory::createQemuCameras()
__FUNCTION__);
}
} else {
LOGW("%s: Bad camera information: %s", __FUNCTION__, cur_entry);
ALOGW("%s: Bad camera information: %s", __FUNCTION__, cur_entry);
}
cur_entry = next_entry;

6
tools/emulator/system/camera/EmulatedFakeCameraDevice.cpp
View File

@@ -71,7 +71,7 @@ status_t EmulatedFakeCameraDevice::connectDevice()
return EINVAL;
}
if (isConnected()) {
LOGW("%s: Fake camera device is already connected.", __FUNCTION__);
ALOGW("%s: Fake camera device is already connected.", __FUNCTION__);
return NO_ERROR;
}
@@ -87,7 +87,7 @@ status_t EmulatedFakeCameraDevice::disconnectDevice()
Mutex::Autolock locker(&mObjectLock);
if (!isConnected()) {
LOGW("%s: Fake camera device is already disconnected.", __FUNCTION__);
ALOGW("%s: Fake camera device is already disconnected.", __FUNCTION__);
return NO_ERROR;
}
if (isStarted()) {
@@ -174,7 +174,7 @@ status_t EmulatedFakeCameraDevice::stopDevice()
Mutex::Autolock locker(&mObjectLock);
if (!isStarted()) {
LOGW("%s: Fake camera device is not started.", __FUNCTION__);
ALOGW("%s: Fake camera device is not started.", __FUNCTION__);
return NO_ERROR;
}

10
tools/emulator/system/camera/EmulatedQemuCameraDevice.cpp
View File

@@ -82,7 +82,7 @@ status_t EmulatedQemuCameraDevice::connectDevice()
return EINVAL;
}
if (isConnected()) {
LOGW("%s: Qemu camera device '%s' is already connected.",
ALOGW("%s: Qemu camera device '%s' is already connected.",
__FUNCTION__, (const char*)mDeviceName);
return NO_ERROR;
}
@@ -107,7 +107,7 @@ status_t EmulatedQemuCameraDevice::disconnectDevice()
Mutex::Autolock locker(&mObjectLock);
if (!isConnected()) {
LOGW("%s: Qemu camera device '%s' is already disconnected.",
ALOGW("%s: Qemu camera device '%s' is already disconnected.",
__FUNCTION__, (const char*)mDeviceName);
return NO_ERROR;
}
@@ -144,7 +144,7 @@ status_t EmulatedQemuCameraDevice::startDevice(int width,
return EINVAL;
}
if (isStarted()) {
LOGW("%s: Qemu camera device '%s' is already started.",
ALOGW("%s: Qemu camera device '%s' is already started.",
__FUNCTION__, (const char*)mDeviceName);
return NO_ERROR;
}
@@ -188,7 +188,7 @@ status_t EmulatedQemuCameraDevice::stopDevice()
Mutex::Autolock locker(&mObjectLock);
if (!isStarted()) {
LOGW("%s: Qemu camera device '%s' is not started.",
ALOGW("%s: Qemu camera device '%s' is not started.",
__FUNCTION__, (const char*)mDeviceName);
return NO_ERROR;
}
@@ -218,7 +218,7 @@ status_t EmulatedQemuCameraDevice::stopDevice()
status_t EmulatedQemuCameraDevice::getCurrentPreviewFrame(void* buffer)
{
LOGW_IF(mPreviewFrame == NULL, "%s: No preview frame", __FUNCTION__);
ALOGW_IF(mPreviewFrame == NULL, "%s: No preview frame", __FUNCTION__);
if (mPreviewFrame != NULL) {
memcpy(buffer, mPreviewFrame, mTotalPixels * 4);
return 0;