diff options
| author | Steve Block <steveblock@google.com> | 2012-01-04 20:05:49 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-04 20:05:49 +0000 |
| commit | df64d15042bbd5e0e4933ac49bf3c177dd94752c (patch) | |
| tree | ff04eb3e1a1ce8c8d8559b93a438f278d984aa87 /services/camera | |
| parent | b8a805261bf0282e992d3608035e47d05a898710 (diff) | |
| download | frameworks_av-df64d15042bbd5e0e4933ac49bf3c177dd94752c.zip frameworks_av-df64d15042bbd5e0e4933ac49bf3c177dd94752c.tar.gz frameworks_av-df64d15042bbd5e0e4933ac49bf3c177dd94752c.tar.bz2 | |
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156801
Bug: 5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/CameraHardwareInterface.h | 4 | ||||
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/services/camera/libcameraservice/CameraHardwareInterface.h b/services/camera/libcameraservice/CameraHardwareInterface.h index 658e25e..44b9de8 100644 --- a/services/camera/libcameraservice/CameraHardwareInterface.h +++ b/services/camera/libcameraservice/CameraHardwareInterface.h @@ -88,7 +88,7 @@ public: ~CameraHardwareInterface() { - LOGI("Destroying camera %s", mName.string()); + ALOGI("Destroying camera %s", mName.string()); if(mDevice) { int rc = mDevice->common.close(&mDevice->common); if (rc != OK) @@ -98,7 +98,7 @@ public: status_t initialize(hw_module_t *module) { - LOGI("Opening camera %s", mName.string()); + ALOGI("Opening camera %s", mName.string()); int rc = module->methods->open(module, mName.string(), (hw_device_t **)&mDevice); if (rc != OK) { diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index d0cafb2..7b4b4ac 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -73,7 +73,7 @@ static CameraService *gCameraService; CameraService::CameraService() :mSoundRef(0), mModule(0) { - LOGI("CameraService started (pid=%d)", getpid()); + ALOGI("CameraService started (pid=%d)", getpid()); gCameraService = this; } @@ -163,7 +163,7 @@ sp<ICamera> CameraService::connect( property_get("sys.secpolicy.camera.disabled", value, "0"); if (strcmp(value, "1") == 0) { // Camera is disabled by DevicePolicyManager. - LOGI("Camera is disabled. connect X (pid %d) rejected", callingPid); + ALOGI("Camera is disabled. connect X (pid %d) rejected", callingPid); return NULL; } |