summaryrefslogtreecommitdiffstats
path: root/libs/camera
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-12-20 16:23:08 +0000
committerSteve Block <steveblock@google.com>2012-01-03 22:38:27 +0000
commit5baa3a62a97544669fba6d65a11c07f252e654dd (patch)
tree109755e1595b438873d34b981e31f84ea64bd2a5 /libs/camera
parent173ab4d61077c49f115b82eff34f97fda5a7273a (diff)
downloadframeworks_base-5baa3a62a97544669fba6d65a11c07f252e654dd.zip
frameworks_base-5baa3a62a97544669fba6d65a11c07f252e654dd.tar.gz
frameworks_base-5baa3a62a97544669fba6d65a11c07f252e654dd.tar.bz2
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
Diffstat (limited to 'libs/camera')
-rw-r--r--libs/camera/Camera.cpp4
-rw-r--r--libs/camera/CameraParameters.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/camera/Camera.cpp b/libs/camera/Camera.cpp
index da21d1a..eef1dd2 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);
}
}
diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp
index c6087b4..209d84a 100644
--- a/libs/camera/CameraParameters.cpp
+++ b/libs/camera/CameraParameters.cpp
@@ -449,12 +449,12 @@ const char *CameraParameters::getPictureFormat() const
void CameraParameters::dump() const
{
- LOGD("dump: mMap.size = %d", mMap.size());
+ ALOGD("dump: mMap.size = %d", mMap.size());
for (size_t i = 0; i < mMap.size(); i++) {
String8 k, v;
k = mMap.keyAt(i);
v = mMap.valueAt(i);
- LOGD("%s: %s\n", k.string(), v.string());
+ ALOGD("%s: %s\n", k.string(), v.string());
}
}