diff options
| author | Steve Block <steveblock@google.com> | 2011-12-20 16:23:08 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-03 22:38:27 +0000 |
| commit | b8a805261bf0282e992d3608035e47d05a898710 (patch) | |
| tree | 7a43908b8e936ac1f30eef0542b40d667c47aa23 /services/camera | |
| parent | 94023fa6744e24f26f0aba1699ec278649bd66df (diff) | |
| download | frameworks_av-b8a805261bf0282e992d3608035e47d05a898710.zip frameworks_av-b8a805261bf0282e992d3608035e47d05a898710.tar.gz frameworks_av-b8a805261bf0282e992d3608035e47d05a898710.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 'services/camera')
3 files changed, 7 insertions, 7 deletions
diff --git a/services/camera/libcameraservice/CameraHardwareStub.cpp b/services/camera/libcameraservice/CameraHardwareStub.cpp index 8558fdd..f922630 100644 --- a/services/camera/libcameraservice/CameraHardwareStub.cpp +++ b/services/camera/libcameraservice/CameraHardwareStub.cpp @@ -70,7 +70,7 @@ void CameraHardwareStub::initHeapLocked() int preview_width, preview_height; mParameters.getPreviewSize(&preview_width, &preview_height); - LOGD("initHeapLocked: preview size=%dx%d", preview_width, preview_height); + ALOGD("initHeapLocked: preview size=%dx%d", preview_width, preview_height); // Note that we enforce yuv420sp in setParameters(). int how_big = preview_width * preview_height * 3 / 2; diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 4760f07..d0cafb2 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -47,8 +47,8 @@ namespace android { // Use "adb shell dumpsys media.camera -v 1" to change it. static volatile int32_t gLogLevel = 0; -#define LOG1(...) LOGD_IF(gLogLevel >= 1, __VA_ARGS__); -#define LOG2(...) LOGD_IF(gLogLevel >= 2, __VA_ARGS__); +#define LOG1(...) ALOGD_IF(gLogLevel >= 1, __VA_ARGS__); +#define LOG2(...) ALOGD_IF(gLogLevel >= 2, __VA_ARGS__); static void setLogLevel(int level) { android_atomic_write(level, &gLogLevel); diff --git a/services/camera/tests/CameraServiceTest/CameraServiceTest.cpp b/services/camera/tests/CameraServiceTest/CameraServiceTest.cpp index e390ae2..69f60ca 100644 --- a/services/camera/tests/CameraServiceTest/CameraServiceTest.cpp +++ b/services/camera/tests/CameraServiceTest/CameraServiceTest.cpp @@ -46,7 +46,7 @@ using namespace android; do { \ printf(__VA_ARGS__); \ printf("\n"); \ - LOGD(__VA_ARGS__); \ + ALOGD(__VA_ARGS__); \ } while(0) void assert_fail(const char *file, int line, const char *func, const char *expr) { @@ -797,7 +797,7 @@ public: int w, h; const char *s = param.get(CameraParameters::KEY_SUPPORTED_PICTURE_SIZES); while (getNextSize(&s, &w, &h)) { - LOGD("checking picture size %dx%d", w, h); + ALOGD("checking picture size %dx%d", w, h); checkOnePicture(w, h); } } @@ -811,7 +811,7 @@ public: // Try all flag combinations. for (int v = 0; v < 8; v++) { - LOGD("TestPreviewCallbackFlag: flag=%d", v); + ALOGD("TestPreviewCallbackFlag: flag=%d", v); usleep(100000); // sleep a while to clear the in-flight callbacks. cc->clearStat(); c->setPreviewCallbackFlag(v); @@ -875,7 +875,7 @@ public: int w, h; const char *s = param.get(CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES); while (getNextSize(&s, &w, &h)) { - LOGD("checking preview size %dx%d", w, h); + ALOGD("checking preview size %dx%d", w, h); checkOnePicture(w, h); } } |