summaryrefslogtreecommitdiffstats
path: root/libs/camera
diff options
context:
space:
mode:
Diffstat (limited to 'libs/camera')
-rw-r--r--libs/camera/Camera.cpp4
-rw-r--r--libs/camera/CameraParameters.cpp8
2 files changed, 6 insertions, 6 deletions
diff --git a/libs/camera/Camera.cpp b/libs/camera/Camera.cpp
index d28b7f8..ee458f1 100644
--- a/libs/camera/Camera.cpp
+++ b/libs/camera/Camera.cpp
@@ -56,7 +56,7 @@ const sp<ICameraService>& Camera::getCameraService()
binder->linkToDeath(mDeathNotifier);
mCameraService = interface_cast<ICameraService>(binder);
}
- LOGE_IF(mCameraService==0, "no CameraService!?");
+ ALOGE_IF(mCameraService==0, "no CameraService!?");
return mCameraService;
}
@@ -72,7 +72,7 @@ sp<Camera> Camera::create(const sp<ICamera>& camera)
{
ALOGV("create");
if (camera == 0) {
- LOGE("camera remote is a NULL pointer");
+ ALOGE("camera remote is a NULL pointer");
return 0;
}
diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp
index 209d84a..059a8a5 100644
--- a/libs/camera/CameraParameters.cpp
+++ b/libs/camera/CameraParameters.cpp
@@ -231,12 +231,12 @@ void CameraParameters::set(const char *key, const char *value)
{
// XXX i think i can do this with strspn()
if (strchr(key, '=') || strchr(key, ';')) {
- //XXX LOGE("Key \"%s\"contains invalid character (= or ;)", key);
+ //XXX ALOGE("Key \"%s\"contains invalid character (= or ;)", key);
return;
}
if (strchr(value, '=') || strchr(key, ';')) {
- //XXX LOGE("Value \"%s\"contains invalid character (= or ;)", value);
+ //XXX ALOGE("Value \"%s\"contains invalid character (= or ;)", value);
return;
}
@@ -294,7 +294,7 @@ static int parse_pair(const char *str, int *first, int *second, char delim,
int w = (int)strtol(str, &end, 10);
// If a delimeter does not immediately follow, give up.
if (*end != delim) {
- LOGE("Cannot find delimeter (%c) in str=%s", delim, str);
+ ALOGE("Cannot find delimeter (%c) in str=%s", delim, str);
return -1;
}
@@ -324,7 +324,7 @@ static void parseSizesList(const char *sizesStr, Vector<Size> &sizes)
int success = parse_pair(sizeStartPtr, &width, &height, 'x',
&sizeStartPtr);
if (success == -1 || (*sizeStartPtr != ',' && *sizeStartPtr != '\0')) {
- LOGE("Picture sizes string \"%s\" contains invalid character.", sizesStr);
+ ALOGE("Picture sizes string \"%s\" contains invalid character.", sizesStr);
return;
}
sizes.push(Size(width, height));