Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d920850 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android (Google) Code Review
Browse files

Merge "Add the setPreviewWindow camera HAL API to the camera stub."

parents 33696164 c8536d19

services/camera/libcameraservice/CameraHardwareStub.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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

services/camera/libcameraservice/CameraHardwareStub.h

+1 −1
Original line number Diff line number Diff line
@@ -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,