summaryrefslogtreecommitdiffstats
path: root/services/camera
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2010-08-23 17:23:08 -0700
committerJamie Gennis <jgennis@google.com>2010-08-23 17:25:55 -0700
commit8f3e6aa2951358c0dea593a2448171a3f97cc0eb (patch)
tree29073542e3377ad44789a7d97bc66f9224f8c552 /services/camera
parent4b79168835965cf0fc41ebe2a367e22b4cb20d08 (diff)
downloadframeworks_av-8f3e6aa2951358c0dea593a2448171a3f97cc0eb.zip
frameworks_av-8f3e6aa2951358c0dea593a2448171a3f97cc0eb.tar.gz
frameworks_av-8f3e6aa2951358c0dea593a2448171a3f97cc0eb.tar.bz2
Add the setPreviewWindow camera HAL API to the camera stub.
Change-Id: Ic669f9d5f5ae8f1fe5bd055f55aa4a18fa6d84cd
Diffstat (limited to 'services/camera')
-rw-r--r--services/camera/libcameraservice/CameraHardwareStub.cpp4
-rw-r--r--services/camera/libcameraservice/CameraHardwareStub.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/services/camera/libcameraservice/CameraHardwareStub.cpp b/services/camera/libcameraservice/CameraHardwareStub.cpp
index b3e0ee6..07b5a37 100644
--- a/services/camera/libcameraservice/CameraHardwareStub.cpp
+++ b/services/camera/libcameraservice/CameraHardwareStub.cpp
@@ -101,9 +101,9 @@ CameraHardwareStub::~CameraHardwareStub()
mFakeCamera = 0; // paranoia
}
-sp<IMemoryHeap> CameraHardwareStub::getPreviewHeap() const
+status_t CameraHardwareStub::setPreviewWindow(const sp<ANativeWindow>& buf)
{
- return mPreviewHeap;
+ return NO_ERROR;
}
sp<IMemoryHeap> CameraHardwareStub::getRawHeap() const
diff --git a/services/camera/libcameraservice/CameraHardwareStub.h b/services/camera/libcameraservice/CameraHardwareStub.h
index d3427ba..9b66a76 100644
--- a/services/camera/libcameraservice/CameraHardwareStub.h
+++ b/services/camera/libcameraservice/CameraHardwareStub.h
@@ -29,7 +29,7 @@ namespace android {
class CameraHardwareStub : public CameraHardwareInterface {
public:
- virtual sp<IMemoryHeap> getPreviewHeap() const;
+ virtual status_t setPreviewWindow(const sp<ANativeWindow>& buf);
virtual sp<IMemoryHeap> getRawHeap() const;
virtual void setCallbacks(notify_callback notify_cb,