summaryrefslogtreecommitdiffstats
path: root/media/libmedia/IMediaPlayer.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-11-12 14:50:02 -0800
committerMarco Nelissen <marcone@google.com>2014-11-12 14:50:02 -0800
commitdfdd3168582ffa72ecfc76c9530a8ea60540f8d2 (patch)
treed0bf31f9b59cb79e632cdd723d6146efd391817b /media/libmedia/IMediaPlayer.cpp
parentfc70a810d18f13bdb04be3307aa2b282b0cdc5b0 (diff)
downloadframeworks_av-dfdd3168582ffa72ecfc76c9530a8ea60540f8d2.zip
frameworks_av-dfdd3168582ffa72ecfc76c9530a8ea60540f8d2.tar.gz
frameworks_av-dfdd3168582ffa72ecfc76c9530a8ea60540f8d2.tar.bz2
Adjust to asBinder()'s new behavior
Change-Id: I2de9e3770d4989bc201d886f4580747569b203dc
Diffstat (limited to 'media/libmedia/IMediaPlayer.cpp')
-rw-r--r--media/libmedia/IMediaPlayer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp
index d778d05..6e0ec83 100644
--- a/media/libmedia/IMediaPlayer.cpp
+++ b/media/libmedia/IMediaPlayer.cpp
@@ -115,7 +115,7 @@ public:
status_t setDataSource(const sp<IStreamSource> &source) {
Parcel data, reply;
data.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor());
- data.writeStrongBinder(source->asBinder());
+ data.writeStrongBinder(source == NULL ? NULL : source->asBinder());
remote()->transact(SET_DATA_SOURCE_STREAM, data, &reply);
return reply.readInt32();
}
@@ -125,7 +125,7 @@ public:
{
Parcel data, reply;
data.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor());
- sp<IBinder> b(bufferProducer->asBinder());
+ sp<IBinder> b(bufferProducer == NULL ? NULL : bufferProducer->asBinder());
data.writeStrongBinder(b);
remote()->transact(SET_VIDEO_SURFACETEXTURE, data, &reply);
return reply.readInt32();
@@ -323,7 +323,7 @@ public:
status_t setNextPlayer(const sp<IMediaPlayer>& player) {
Parcel data, reply;
data.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor());
- sp<IBinder> b(player->asBinder());
+ sp<IBinder> b(player == NULL ? NULL : player->asBinder());
data.writeStrongBinder(b);
remote()->transact(SET_NEXT_PLAYER, data, &reply);
return reply.readInt32();