diff options
| -rw-r--r-- | full_crespo.mk | 2 | ||||
| -rw-r--r-- | libcamera/SecCameraHWInterface.cpp | 5 | ||||
| -rw-r--r-- | libcamera/SecCameraHWInterface.h | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/full_crespo.mk b/full_crespo.mk index aa57db7..3aa53b8 100644 --- a/full_crespo.mk +++ b/full_crespo.mk @@ -37,7 +37,7 @@ PRODUCT_COPY_FILES := device/sample/etc/apns-full-conf.xml:system/etc/apns-conf. $(call inherit-product-if-exists, vendor/samsung/crespo/full_crespo-trampoline.mk) # Inherit from those products. Most specific first. -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) # This is where we'd set a backup provider if we had one #$(call inherit-product, device/sample/products/backup_overlay.mk) $(call inherit-product, device/samsung/crespo/device.mk) diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp index 509f4fd..d2047c1 100644 --- a/libcamera/SecCameraHWInterface.cpp +++ b/libcamera/SecCameraHWInterface.cpp @@ -415,6 +415,11 @@ CameraHardwareSec::~CameraHardwareSec() singleton.clear(); } +status_t CameraHardwareSec::setPreviewWindow(const sp<ANativeWindow>& buf) +{ + return NO_ERROR; +} + sp<IMemoryHeap> CameraHardwareSec::getPreviewHeap() const { return mPreviewHeap; diff --git a/libcamera/SecCameraHWInterface.h b/libcamera/SecCameraHWInterface.h index 5ac3e91..a98e935 100644 --- a/libcamera/SecCameraHWInterface.h +++ b/libcamera/SecCameraHWInterface.h @@ -64,6 +64,7 @@ public: virtual CameraParameters getParameters() const; virtual status_t sendCommand(int32_t command, int32_t arg1, int32_t arg2); + virtual status_t setPreviewWindow(const sp<ANativeWindow>& buf); virtual void release(); static sp<CameraHardwareInterface> createInstance(int cameraId); |