diff options
| -rw-r--r-- | include/ui/Camera.h | 1 | ||||
| -rw-r--r-- | libs/ui/Camera.cpp | 20 |
2 files changed, 7 insertions, 14 deletions
diff --git a/include/ui/Camera.h b/include/ui/Camera.h index 12fa20f..fd851d9 100644 --- a/include/ui/Camera.h +++ b/include/ui/Camera.h @@ -78,7 +78,6 @@ class Camera : public BnCameraClient, public IBinder::DeathRecipient { public: // construct a camera client from an existing remote - Camera(const sp<ICamera>& camera); // to be removed static sp<Camera> create(const sp<ICamera>& camera); static sp<Camera> connect(); ~Camera(); diff --git a/libs/ui/Camera.cpp b/libs/ui/Camera.cpp index 0fba82c..41577c4 100644 --- a/libs/ui/Camera.cpp +++ b/libs/ui/Camera.cpp @@ -64,22 +64,16 @@ Camera::Camera() init(); } -Camera::Camera(const sp<ICamera>& camera) -{ - init(); - // connect this client to existing camera remote - if (camera->connect(this) == NO_ERROR) { - mStatus = NO_ERROR; - mCamera = camera; - camera->asBinder()->linkToDeath(this); - } -} - - +// construct a camera client from an existing camera remote sp<Camera> Camera::create(const sp<ICamera>& camera) { + LOGV("create"); + if (camera == 0) { + LOGE("camera remote is a NULL pointer"); + return 0; + } + sp<Camera> c = new Camera(); - // connect this client to existing camera remote if (camera->connect(c) == NO_ERROR) { c->mStatus = NO_ERROR; c->mCamera = camera; |