Camera2: Clean up startup/shutdown sequences.
- Close camera device on startup errors
- Make sure all threads are shut down and the device is closed before
returning from ICamera::disconnect.
Bug: 7172680
Change-Id: I98611448ec5f2311e6604fa8ee5f9dde7bfdd988
diff --git a/services/camera/libcameraservice/Camera2Device.h b/services/camera/libcameraservice/Camera2Device.h
index a327d8d..38662e3 100644
--- a/services/camera/libcameraservice/Camera2Device.h
+++ b/services/camera/libcameraservice/Camera2Device.h
@@ -40,6 +40,7 @@
~Camera2Device();
status_t initialize(camera_module_t *module);
+ status_t disconnect();
status_t dump(int fd, const Vector<String16>& args);
@@ -191,7 +192,6 @@
buffer_handle_t *buffer, wp<BufferReleasedListener> listener);
private:
-
const int mId;
camera2_device_t *mDevice;