From a0e33d0aa0662c33f1145f95b13c3a741fcfc42f Mon Sep 17 00:00:00 2001
From: Andrew Dodd <atd7@cornell.edu>
Date: Sat, 14 Jul 2012 14:53:53 -0400
Subject: camera: Add missing QCOM_HARDWARE #ifdefs

http://review.cyanogenmod.com/#/c/18206/2 was
missing a few QCOM_HARDWARE #ifdefs even though its origin
was CAF.  So far, 18206 has only had positive effects on
certain QCOM devices, and is a noop or breaks things on
non-QCOM.

Per discussion with arcee - #ifdef the rest as QCOM

Change-Id: I46684ef5e6c580137104ad81b4faf58858bbfdd3
---
 services/camera/libcameraservice/CameraHardwareInterface.h | 2 ++
 services/camera/libcameraservice/CameraService.cpp         | 4 ++++
 2 files changed, 6 insertions(+)

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;
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 8d95d65..e15a1b9 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -528,7 +528,9 @@ void CameraService::Client::disconnect() {
 
     // Release the held ANativeWindow resources.
     if (mPreviewWindow != 0) {
+#ifdef QCOM_HARDWARE
         mHardware->setPreviewWindow(0);
+#endif
         disconnectWindow(mPreviewWindow);
         mPreviewWindow = 0;
     }
@@ -570,8 +572,10 @@ status_t CameraService::Client::setPreviewWindow(const sp<IBinder>& binder,
             native_window_set_buffers_transform(window.get(), mOrientation);
             result = mHardware->setPreviewWindow(window);
         }
+#ifdef QCOM_HARDWARE
     } else {
         result = mHardware->setPreviewWindow(window);
+#endif
     }
 
     if (result == NO_ERROR) {
-- 
cgit v1.1