summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2012-01-05 23:22:43 +0000
committerSteve Block <steveblock@google.com>2012-01-06 10:07:54 +0000
commit5ff1dd576bb93c45b44088a51544a18fc43ebf58 (patch)
treec002dcda87f08329197b01395539bd25f10ca737 /camera
parent8a08dcc0a5de19a904e77d5f31bed3dff9a59890 (diff)
downloadframeworks_av-5ff1dd576bb93c45b44088a51544a18fc43ebf58.zip
frameworks_av-5ff1dd576bb93c45b44088a51544a18fc43ebf58.tar.gz
frameworks_av-5ff1dd576bb93c45b44088a51544a18fc43ebf58.tar.bz2
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
Diffstat (limited to 'camera')
-rw-r--r--camera/Camera.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/camera/Camera.cpp b/camera/Camera.cpp
index eef1dd2..d28b7f8 100644
--- a/camera/Camera.cpp
+++ b/camera/Camera.cpp
@@ -47,7 +47,7 @@ const sp<ICameraService>& Camera::getCameraService()
binder = sm->getService(String16("media.camera"));
if (binder != 0)
break;
- LOGW("CameraService not published, waiting...");
+ ALOGW("CameraService not published, waiting...");
usleep(500000); // 0.5 s
} while(true);
if (mDeathNotifier == NULL) {
@@ -397,13 +397,13 @@ void Camera::dataCallbackTimestamp(nsecs_t timestamp, int32_t msgType, const sp<
if (listener != NULL) {
listener->postDataTimestamp(timestamp, msgType, dataPtr);
} else {
- LOGW("No listener was set. Drop a recording frame.");
+ ALOGW("No listener was set. Drop a recording frame.");
releaseRecordingFrame(dataPtr);
}
}
void Camera::binderDied(const wp<IBinder>& who) {
- LOGW("ICamera died");
+ ALOGW("ICamera died");
notifyCallback(CAMERA_MSG_ERROR, CAMERA_ERROR_SERVER_DIED, 0);
}
@@ -411,7 +411,7 @@ void Camera::DeathNotifier::binderDied(const wp<IBinder>& who) {
ALOGV("binderDied");
Mutex::Autolock _l(Camera::mLock);
Camera::mCameraService.clear();
- LOGW("Camera server died!");
+ ALOGW("Camera server died!");
}
sp<ICameraRecordingProxy> Camera::getRecordingProxy() {