summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2012-01-05 23:28:01 +0000
committerSteve Block <steveblock@google.com>2012-01-05 23:28:01 +0000
commita4e4aeab47b17a82524ac56f2d69daa3e47c1ce7 (patch)
treec8305da2c5bf46bc97c5320c863e73b66938afc1
parentbb0a9edbe9d4072ed227550d898f0c2d0149e0ba (diff)
downloadhardware_ti_omap4xxx-a4e4aeab47b17a82524ac56f2d69daa3e47c1ce7.tar.gz
hardware_ti_omap4xxx-a4e4aeab47b17a82524ac56f2d69daa3e47c1ce7.tar.bz2
hardware_ti_omap4xxx-a4e4aeab47b17a82524ac56f2d69daa3e47c1ce7.zip
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I71aea6795e3ed22beacb9a8f5774499e96c69a4d
-rw-r--r--camera/OMXCameraAdapter/OMX3A.cpp2
-rw-r--r--hwc/hwc.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/camera/OMXCameraAdapter/OMX3A.cpp b/camera/OMXCameraAdapter/OMX3A.cpp
index 5eadc44..0182446 100644
--- a/camera/OMXCameraAdapter/OMX3A.cpp
+++ b/camera/OMXCameraAdapter/OMX3A.cpp
@@ -492,7 +492,7 @@ static bool isFlashDisabled() {
char value[PROPERTY_VALUE_MAX];
if (property_get("camera.flash_off", value, NULL) &&
(!strcasecmp(value, "true") || !strcasecmp(value, "1"))) {
- LOGW("flash is disabled for testing purpose");
+ ALOGW("flash is disabled for testing purpose");
return true;
}
diff --git a/hwc/hwc.c b/hwc/hwc.c
index 514175e..146bc5d 100644
--- a/hwc/hwc.c
+++ b/hwc/hwc.c
@@ -928,7 +928,7 @@ static int omap4_hwc_set_best_hdmi_mode(omap4_hwc_device_t *hwc_dev, __u32 xres,
!omap4_hwc_can_scale(xres, yres, ext_fb_xres, ext_fb_yres,
1, &d.dis, &limits,
d.dis.timings.pixel_clock)) {
- LOGW("DSS scaler cannot support HDMI cloning");
+ ALOGW("DSS scaler cannot support HDMI cloning");
return -1;
}
}
@@ -1403,18 +1403,18 @@ static void omap4_hwc_reset_screen(omap4_hwc_device_t *hwc_dev)
/* remove bootloader image from the screen as blank/unblank does not change the composition */
ret = ioctl(hwc_dev->dsscomp_fd, DSSCIOC_SETUP_DISPC, &d);
if (ret)
- LOGW("failed to remove bootloader image");
+ ALOGW("failed to remove bootloader image");
/* blank and unblank fd to make sure display is properly programmed on boot.
* This is needed because the bootloader can not be trusted.
*/
ret = ioctl(hwc_dev->fb_fd, FBIOBLANK, FB_BLANK_POWERDOWN);
if (ret)
- LOGW("failed to blank display");
+ ALOGW("failed to blank display");
ret = ioctl(hwc_dev->fb_fd, FBIOBLANK, FB_BLANK_UNBLANK);
if (ret)
- LOGW("failed to blank display");
+ ALOGW("failed to blank display");
}
}