diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-07-15 16:04:27 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2015-07-16 14:55:33 -0700 |
| commit | b25e3c87724b6147ed1da7c1d6617c39bfce2fbf (patch) | |
| tree | c0e95e487b2583b8ba87e2ce5505fb74dec9d2d8 /services/camera/libcameraservice/device2 | |
| parent | 1bc88814f530bf67e425cfb8cea0f2b8dce3c03f (diff) | |
| download | frameworks_av-b25e3c87724b6147ed1da7c1d6617c39bfce2fbf.zip frameworks_av-b25e3c87724b6147ed1da7c1d6617c39bfce2fbf.tar.gz frameworks_av-b25e3c87724b6147ed1da7c1d6617c39bfce2fbf.tar.bz2 | |
Camera: Add hidden experimental tearDown method.
Bug: 18949148
Change-Id: Ie86ec7d1ec3db54e1154563b2339a208a935f849
Diffstat (limited to 'services/camera/libcameraservice/device2')
| -rw-r--r-- | services/camera/libcameraservice/device2/Camera2Device.cpp | 6 | ||||
| -rw-r--r-- | services/camera/libcameraservice/device2/Camera2Device.h | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/device2/Camera2Device.cpp b/services/camera/libcameraservice/device2/Camera2Device.cpp index dfe5565..c9c990c 100644 --- a/services/camera/libcameraservice/device2/Camera2Device.cpp +++ b/services/camera/libcameraservice/device2/Camera2Device.cpp @@ -626,6 +626,12 @@ status_t Camera2Device::prepare(int streamId) { return NO_INIT; } +status_t Camera2Device::tearDown(int streamId) { + ATRACE_CALL(); + ALOGE("%s: Camera %d: unimplemented", __FUNCTION__, mId); + return NO_INIT; +} + uint32_t Camera2Device::getDeviceVersion() { ATRACE_CALL(); return mDeviceVersion; diff --git a/services/camera/libcameraservice/device2/Camera2Device.h b/services/camera/libcameraservice/device2/Camera2Device.h index c9f3a2c..34c1ded 100644 --- a/services/camera/libcameraservice/device2/Camera2Device.h +++ b/services/camera/libcameraservice/device2/Camera2Device.h @@ -85,8 +85,9 @@ class Camera2Device: public CameraDeviceBase { buffer_handle_t *buffer, wp<BufferReleasedListener> listener); // Flush implemented as just a wait virtual status_t flush(int64_t *lastFrameNumber = NULL); - // Prepare is a no-op + // Prepare and tearDown are no-ops virtual status_t prepare(int streamId); + virtual status_t tearDown(int streamId); virtual uint32_t getDeviceVersion(); virtual ssize_t getJpegBufferSize(uint32_t width, uint32_t height) const; |