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/ICamera.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/ICamera.cpp')
-rw-r--r-- | camera/ICamera.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/camera/ICamera.cpp b/camera/ICamera.cpp index ca31c65..9943be6 100644 --- a/camera/ICamera.cpp +++ b/camera/ICamera.cpp @@ -75,7 +75,7 @@ public: ALOGV("setPreviewTarget"); Parcel data, reply; data.writeInterfaceToken(ICamera::getInterfaceDescriptor()); - sp<IBinder> b(bufferProducer != NULL ? bufferProducer->asBinder() : NULL); + sp<IBinder> b(IInterface::asBinder(bufferProducer)); data.writeStrongBinder(b); remote()->transact(SET_PREVIEW_TARGET, data, &reply); return reply.readInt32(); @@ -98,7 +98,7 @@ public: ALOGV("setPreviewCallbackTarget"); Parcel data, reply; data.writeInterfaceToken(ICamera::getInterfaceDescriptor()); - sp<IBinder> b(callbackProducer->asBinder()); + sp<IBinder> b(IInterface::asBinder(callbackProducer)); data.writeStrongBinder(b); remote()->transact(SET_PREVIEW_CALLBACK_TARGET, data, &reply); return reply.readInt32(); @@ -147,7 +147,7 @@ public: ALOGV("releaseRecordingFrame"); Parcel data, reply; data.writeInterfaceToken(ICamera::getInterfaceDescriptor()); - data.writeStrongBinder(mem->asBinder()); + data.writeStrongBinder(IInterface::asBinder(mem)); remote()->transact(RELEASE_RECORDING_FRAME, data, &reply); } @@ -250,7 +250,7 @@ public: { Parcel data, reply; data.writeInterfaceToken(ICamera::getInterfaceDescriptor()); - data.writeStrongBinder(cameraClient->asBinder()); + data.writeStrongBinder(IInterface::asBinder(cameraClient)); remote()->transact(CONNECT, data, &reply); return reply.readInt32(); } |