summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/MediaPlayerService.cpp
diff options
context:
space:
mode:
authorJason Simmons <jsimmons@google.com>2011-08-12 13:46:55 -0700
committerJason Simmons <jsimmons@google.com>2011-08-12 13:46:55 -0700
commitdb29e5238e28d59978755a2ff2e7e0f05393abdf (patch)
treebc6a7aa136f0397facbce93eb5204a4e61e3a2eb /media/libmediaplayerservice/MediaPlayerService.cpp
parenta2e0a4259191fc486e0f563b992e3eadd7f9ae4b (diff)
downloadframeworks_av-db29e5238e28d59978755a2ff2e7e0f05393abdf.zip
frameworks_av-db29e5238e28d59978755a2ff2e7e0f05393abdf.tar.gz
frameworks_av-db29e5238e28d59978755a2ff2e7e0f05393abdf.tar.bz2
Add a null check to handle failure of android::createPlayer
Change-Id: Id56bd0c16104e46d8dc71f13d8a44aefe251fad4
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 8630ec1..2051b3b 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -687,7 +687,9 @@ sp<MediaPlayerBase> MediaPlayerService::Client::createPlayer(player_type playerT
p = android::createPlayer(playerType, this, notify);
}
- p->setUID(mUID);
+ if (p != NULL) {
+ p->setUID(mUID);
+ }
return p;
}