diff options
author | Marco Nelissen <marcone@google.com> | 2014-11-14 07:58:25 -0800 |
---|---|---|
committer | Marco Nelissen <marcone@google.com> | 2014-11-17 10:05:07 -0800 |
commit | f888020c6e2735624f2b2a30e72aca24e17b8b4d (patch) | |
tree | 76d92b7a91a4bebd4e84d6afdc2ef4a2e4943df8 /camera/CameraBase.cpp | |
parent | d02641098b16df2fd4cd32b72a30eb6f3b64e12b (diff) | |
download | frameworks_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/CameraBase.cpp')
-rw-r--r-- | camera/CameraBase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/CameraBase.cpp b/camera/CameraBase.cpp index 04694cd..65a1a47 100644 --- a/camera/CameraBase.cpp +++ b/camera/CameraBase.cpp @@ -107,7 +107,7 @@ sp<TCam> CameraBase<TCam, TCamTraits>::connect(int cameraId, /*out*/ c->mCamera); } if (status == OK && c->mCamera != 0) { - c->mCamera->asBinder()->linkToDeath(c); + IInterface::asBinder(c->mCamera)->linkToDeath(c); c->mStatus = NO_ERROR; } else { ALOGW("An error occurred while connecting to camera: %d", cameraId); @@ -122,7 +122,7 @@ void CameraBase<TCam, TCamTraits>::disconnect() ALOGV("%s: disconnect", __FUNCTION__); if (mCamera != 0) { mCamera->disconnect(); - mCamera->asBinder()->unlinkToDeath(this); + IInterface::asBinder(mCamera)->unlinkToDeath(this); mCamera = 0; } ALOGV("%s: disconnect (done)", __FUNCTION__); |