diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-07-17 16:53:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-17 16:54:04 +0000 |
| commit | 48e5df72f8a7fdcf6278fc395376fbaf98444a43 (patch) | |
| tree | 890ff786d667f8a2c9c06a95767cf070fced6d32 /services/camera/libcameraservice/device2/Camera2Device.cpp | |
| parent | 9febc8a664d25eaa699134682aa455ab4d7f62a2 (diff) | |
| parent | b25e3c87724b6147ed1da7c1d6617c39bfce2fbf (diff) | |
| download | frameworks_av-48e5df72f8a7fdcf6278fc395376fbaf98444a43.zip frameworks_av-48e5df72f8a7fdcf6278fc395376fbaf98444a43.tar.gz frameworks_av-48e5df72f8a7fdcf6278fc395376fbaf98444a43.tar.bz2 | |
Merge "Camera: Add hidden experimental tearDown method." into mnc-dev
Diffstat (limited to 'services/camera/libcameraservice/device2/Camera2Device.cpp')
| -rw-r--r-- | services/camera/libcameraservice/device2/Camera2Device.cpp | 6 |
1 files changed, 6 insertions, 0 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; |