diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-07-15 00:43:21 +0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-07-15 00:43:21 +0400 |
| commit | 954787ae12925358d0c2773fa631e7716f107dcd (patch) | |
| tree | a587fe5b894c7cfd124bb9050b26e99861fcd02c /services/camera/libcameraservice/CameraHardwareInterface.h | |
| parent | 9bacd1193da96531820a250dc3eed7f60c2ccc15 (diff) | |
| parent | a0e33d0aa0662c33f1145f95b13c3a741fcfc42f (diff) | |
| download | frameworks_base-954787ae12925358d0c2773fa631e7716f107dcd.zip frameworks_base-954787ae12925358d0c2773fa631e7716f107dcd.tar.gz frameworks_base-954787ae12925358d0c2773fa631e7716f107dcd.tar.bz2 | |
Merge "camera: Add missing QCOM_HARDWARE #ifdefs" into ics
Diffstat (limited to 'services/camera/libcameraservice/CameraHardwareInterface.h')
| -rwxr-xr-x | services/camera/libcameraservice/CameraHardwareInterface.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/CameraHardwareInterface.h b/services/camera/libcameraservice/CameraHardwareInterface.h index 9a29e8f..f787266 100755 --- a/services/camera/libcameraservice/CameraHardwareInterface.h +++ b/services/camera/libcameraservice/CameraHardwareInterface.h @@ -115,10 +115,12 @@ public: LOGV("%s(%s) buf %p", __FUNCTION__, mName.string(), buf.get()); if (mDevice->ops->set_preview_window) { +#ifdef QCOM_HARDWARE LOGV("%s buf %p mPreviewWindow %p", __FUNCTION__, buf.get(), mPreviewWindow.get()); if (mPreviewWindow.get() && (buf.get() != mPreviewWindow.get())) { mDevice->ops->set_preview_window(mDevice, 0); } +#endif mPreviewWindow = buf; mHalPreviewWindow.user = this; |