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 /services/camera/libcameraservice/api2 | |
| 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 'services/camera/libcameraservice/api2')
| -rw-r--r-- | services/camera/libcameraservice/api2/CameraDeviceClient.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp index c6d62e7..920adf6 100644 --- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp +++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp @@ -43,7 +43,7 @@ CameraDeviceClientBase::CameraDeviceClientBase( uid_t clientUid, int servicePid) : BasicClient(cameraService, - remoteCallback != NULL ? remoteCallback->asBinder() : NULL, + IInterface::asBinder(remoteCallback), clientPackageName, cameraId, cameraFacing, @@ -163,7 +163,7 @@ status_t CameraDeviceClient::submitRequestList(List<sp<CaptureRequest> > request if (surface == 0) continue; sp<IGraphicBufferProducer> gbp = surface->getIGraphicBufferProducer(); - int idx = mStreamMap.indexOfKey(gbp->asBinder()); + int idx = mStreamMap.indexOfKey(IInterface::asBinder(gbp)); // Trying to submit request with surface that wasn't created if (idx == NAME_NOT_FOUND) { @@ -333,7 +333,7 @@ status_t CameraDeviceClient::createStream(int width, int height, int format, // Don't create multiple streams for the same target surface { - ssize_t index = mStreamMap.indexOfKey(bufferProducer->asBinder()); + ssize_t index = mStreamMap.indexOfKey(IInterface::asBinder(bufferProducer)); if (index != NAME_NOT_FOUND) { ALOGW("%s: Camera %d: Buffer producer already has a stream for it " "(ID %zd)", @@ -359,7 +359,7 @@ status_t CameraDeviceClient::createStream(int width, int height, int format, useAsync = true; } - sp<IBinder> binder = bufferProducer->asBinder(); + sp<IBinder> binder = IInterface::asBinder(bufferProducer); sp<ANativeWindow> anw = new Surface(bufferProducer, useAsync); // TODO: remove w,h,f since we are ignoring them @@ -517,7 +517,7 @@ status_t CameraDeviceClient::dump(int fd, const Vector<String16>& args) { result.appendFormat("CameraDeviceClient[%d] (%p) dump:\n", mCameraId, (getRemoteCallback() != NULL ? - getRemoteCallback()->asBinder().get() : NULL) ); + IInterface::asBinder(getRemoteCallback()).get() : NULL) ); result.appendFormat(" Current client: %s (PID %d, UID %u)\n", String8(mClientPackageName).string(), mClientPid, mClientUid); |