commit 2458d482c4822c6f9e6274f5bd12b6aea095a9cd
author Eino-Ville Talvala <etalvala@google.com> Mon Oct 08 22:20:47 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 08 22:20:47 2012 -0700
tree 7ce2bbb63ccd835dd0fdee8096a99300700f08db
parent 82edd5431951f461058c07b73c0dbc093aa45c99
parent 036bc3e2cfc5a11c3f7ace41088c8936dae2e946

Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 6fbd6ed..124d24d 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -409,6 +409,9 @@
 // tear down the client
 CameraService::Client::~Client() {
     mCameraService->releaseSound();
+
+    // unconditionally disconnect. function is idempotent
+    Client::disconnect();
 }
 
 // ----------------------------------------------------------------------------
@@ -433,6 +436,7 @@
     return client;
 }
 
+// NOTE: function is idempotent
 void CameraService::Client::disconnect() {
     mCameraService->removeClient(mCameraClient);
     mCameraService->setCameraFree(mCameraId);