diff options
| author | Marco Nelissen <marcone@google.com> | 2014-11-17 10:50:55 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2014-11-17 10:50:55 -0800 |
| commit | 77e79a509d19ab50b1867fe3903b5a8fae450591 (patch) | |
| tree | 881d068bdc54d4835665e48649165f07393caafa /camera/Camera.cpp | |
| parent | 575174d62b665900203d70a4d410329b8918c2af (diff) | |
| parent | e78a27ca9c701aa996eee0e47fa26dd69d80ffcf (diff) | |
| download | frameworks_av-77e79a509d19ab50b1867fe3903b5a8fae450591.zip frameworks_av-77e79a509d19ab50b1867fe3903b5a8fae450591.tar.gz frameworks_av-77e79a509d19ab50b1867fe3903b5a8fae450591.tar.bz2 | |
resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aosp
Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
Diffstat (limited to 'camera/Camera.cpp')
| -rw-r--r-- | camera/Camera.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/Camera.cpp b/camera/Camera.cpp index 85f44f0..3a9fb4c 100644 --- a/camera/Camera.cpp +++ b/camera/Camera.cpp @@ -55,7 +55,7 @@ sp<Camera> Camera::create(const sp<ICamera>& camera) if (camera->connect(c) == NO_ERROR) { c->mStatus = NO_ERROR; c->mCamera = camera; - camera->asBinder()->linkToDeath(c); + IInterface::asBinder(camera)->linkToDeath(c); return c; } return 0; @@ -93,7 +93,7 @@ status_t Camera::connectLegacy(int cameraId, int halVersion, clientUid, /*out*/c->mCamera); } if (status == OK && c->mCamera != 0) { - c->mCamera->asBinder()->linkToDeath(c); + IInterface::asBinder(c->mCamera)->linkToDeath(c); c->mStatus = NO_ERROR; camera = c; } else { |