summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/common
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2014-07-23 17:17:59 -0700
committerEino-Ville Talvala <etalvala@google.com>2014-07-28 20:20:36 +0000
commitf67e23ef637d0b53a0d4bebb68c654234df3da94 (patch)
tree3b61f96b8fa4a85b3a1780e03985d15e8e2e3d5c /services/camera/libcameraservice/common
parentef9c5ade2308f9eb6f222db3c4796e196f0ab76c (diff)
downloadframeworks_av-f67e23ef637d0b53a0d4bebb68c654234df3da94.zip
frameworks_av-f67e23ef637d0b53a0d4bebb68c654234df3da94.tar.gz
frameworks_av-f67e23ef637d0b53a0d4bebb68c654234df3da94.tar.bz2
CameraService: Clean up availability listeners and HAL error codes
- Refactor where availability listeners are called to centralize behavior, ensuring that all client creation/destruction invokes the listeners - Clean up some of the client hierarchy - Filter error codes from key HAL calls to ensure proper reporting Bug: 16514157 Bug: 16483222 Change-Id: I59875a865b6a508b47423946c78862da8df34cd1
Diffstat (limited to 'services/camera/libcameraservice/common')
-rw-r--r--services/camera/libcameraservice/common/Camera2ClientBase.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/common/Camera2ClientBase.cpp b/services/camera/libcameraservice/common/Camera2ClientBase.cpp
index 13c9f48..24d173c 100644
--- a/services/camera/libcameraservice/common/Camera2ClientBase.cpp
+++ b/services/camera/libcameraservice/common/Camera2ClientBase.cpp
@@ -112,8 +112,6 @@ Camera2ClientBase<TClientBase>::~Camera2ClientBase() {
TClientBase::mDestructionStarted = true;
- TClientBase::finishCameraOps();
-
disconnect();
ALOGI("Closed Camera %d", TClientBase::mCameraId);