Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev (19caf26b) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/CameraService.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -409,6 +409,9 @@ CameraService::Client::Client(const sp<CameraService>& cameraService,
		// tear down the client
		CameraService::Client::~Client() {
		mCameraService->releaseSound();

		// unconditionally disconnect. function is idempotent
		Client::disconnect();
		}

		// ----------------------------------------------------------------------------
		@@ -433,6 +436,7 @@ CameraService::Client* CameraService::Client::getClientFromCookie(void* user) {
		return client;
		}

		// NOTE: function is idempotent
		void CameraService::Client::disconnect() {
		mCameraService->removeClient(mCameraClient);
		mCameraService->setCameraFree(mCameraId);