summaryrefslogtreecommitdiffstats
path: root/camera/ICamera.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-11-14 07:58:25 -0800
committerMarco Nelissen <marcone@google.com>2014-11-17 10:05:07 -0800
commitf888020c6e2735624f2b2a30e72aca24e17b8b4d (patch)
tree76d92b7a91a4bebd4e84d6afdc2ef4a2e4943df8 /camera/ICamera.cpp
parentd02641098b16df2fd4cd32b72a30eb6f3b64e12b (diff)
downloadframeworks_av-f888020c6e2735624f2b2a30e72aca24e17b8b4d.zip
frameworks_av-f888020c6e2735624f2b2a30e72aca24e17b8b4d.tar.gz
frameworks_av-f888020c6e2735624f2b2a30e72aca24e17b8b4d.tar.bz2
Update calls to IInterface::asBinder()
to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
Diffstat (limited to 'camera/ICamera.cpp')
-rw-r--r--camera/ICamera.cpp8
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();
}