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 /media/libmediaplayerservice/MediaPlayerService.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 'media/libmediaplayerservice/MediaPlayerService.cpp')
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 8eb1269..7bb154e 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -817,8 +817,7 @@ status_t MediaPlayerService::Client::setVideoSurfaceTexture( sp<MediaPlayerBase> p = getPlayer(); if (p == 0) return UNKNOWN_ERROR; - sp<IBinder> binder(bufferProducer == NULL ? NULL : - bufferProducer->asBinder()); + sp<IBinder> binder(IInterface::asBinder(bufferProducer)); if (mConnectedWindowBinder == binder) { return OK; } |