diff options
author | Steve Block <steveblock@google.com> | 2012-01-06 19:20:56 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-08 13:19:13 +0000 |
commit | 29357bc2c0dd7c43ad3bd0c8e3efa4e6fd9bfd47 (patch) | |
tree | 3bdafe4b02fe36f6ee29c3170f0b0d2799bebf86 /services/camera/libcameraservice/CameraHardwareInterface.h | |
parent | d709ca9c6a0fa1c8f40cbe624a119398643c5087 (diff) | |
download | frameworks_av-29357bc2c0dd7c43ad3bd0c8e3efa4e6fd9bfd47.zip frameworks_av-29357bc2c0dd7c43ad3bd0c8e3efa4e6fd9bfd47.tar.gz frameworks_av-29357bc2c0dd7c43ad3bd0c8e3efa4e6fd9bfd47.tar.bz2 |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
Diffstat (limited to 'services/camera/libcameraservice/CameraHardwareInterface.h')
-rw-r--r-- | services/camera/libcameraservice/CameraHardwareInterface.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/camera/libcameraservice/CameraHardwareInterface.h b/services/camera/libcameraservice/CameraHardwareInterface.h index 44b9de8..34087b5 100644 --- a/services/camera/libcameraservice/CameraHardwareInterface.h +++ b/services/camera/libcameraservice/CameraHardwareInterface.h @@ -92,7 +92,7 @@ public: if(mDevice) { int rc = mDevice->common.close(&mDevice->common); if (rc != OK) - LOGE("Could not close camera %s: %d", mName.string(), rc); + ALOGE("Could not close camera %s: %d", mName.string(), rc); } } @@ -102,7 +102,7 @@ public: int rc = module->methods->open(module, mName.string(), (hw_device_t **)&mDevice); if (rc != OK) { - LOGE("Could not open camera %s: %d", mName.string(), rc); + ALOGE("Could not open camera %s: %d", mName.string(), rc); return rc; } initHalPreviewWindow(); @@ -460,7 +460,7 @@ private: static_cast<CameraHardwareInterface *>(user); sp<CameraHeapMemory> mem(static_cast<CameraHeapMemory *>(data->handle)); if (index >= mem->mNumBufs) { - LOGE("%s: invalid buffer index %d, max allowed is %d", __FUNCTION__, + ALOGE("%s: invalid buffer index %d, max allowed is %d", __FUNCTION__, index, mem->mNumBufs); return; } @@ -479,7 +479,7 @@ private: // MemoryHeapBase. sp<CameraHeapMemory> mem(static_cast<CameraHeapMemory *>(data->handle)); if (index >= mem->mNumBufs) { - LOGE("%s: invalid buffer index %d, max allowed is %d", __FUNCTION__, + ALOGE("%s: invalid buffer index %d, max allowed is %d", __FUNCTION__, index, mem->mNumBufs); return; } |