summaryrefslogtreecommitdiff
path: root/libs/camera/Camera.cpp
diff options
context:
space:
mode:
author Steve Block <steveblock@google.com> 2012-01-04 10:13:13 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2012-01-04 10:13:13 -0800
commit41891aeaf4e6e4006ae3087fa537786e9ec8caa4 (patch)
tree919fcb8f1583cb4357f16468b1fc6eaf1a5b0144 /libs/camera/Camera.cpp
parent7c48707a9d320230452d5937239f28ab0ea2e695 (diff)
parent5baa3a62a97544669fba6d65a11c07f252e654dd (diff)
Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE"
Diffstat (limited to 'libs/camera/Camera.cpp')
-rw-r--r--libs/camera/Camera.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/camera/Camera.cpp b/libs/camera/Camera.cpp
index da21d1a05276..eef1dd2ef2c1 100644
--- a/libs/camera/Camera.cpp
+++ b/libs/camera/Camera.cpp
@@ -178,7 +178,7 @@ status_t Camera::setPreviewDisplay(const sp<Surface>& surface)
if (surface != 0) {
return c->setPreviewDisplay(surface);
} else {
- LOGD("app passed NULL surface");
+ ALOGD("app passed NULL surface");
return c->setPreviewDisplay(0);
}
}
@@ -192,7 +192,7 @@ status_t Camera::setPreviewTexture(const sp<ISurfaceTexture>& surfaceTexture)
if (surfaceTexture != 0) {
return c->setPreviewTexture(surfaceTexture);
} else {
- LOGD("app passed NULL surface");
+ ALOGD("app passed NULL surface");
return c->setPreviewTexture(0);
}
}