commit db29e5238e28d59978755a2ff2e7e0f05393abdf
author Jason Simmons <jsimmons@google.com> Fri Aug 12 13:46:55 2011 -0700
committer Jason Simmons <jsimmons@google.com> Fri Aug 12 13:46:55 2011 -0700
tree bc6a7aa136f0397facbce93eb5204a4e61e3a2eb
parent a2e0a4259191fc486e0f563b992e3eadd7f9ae4b

Add a null check to handle failure of android::createPlayer

Change-Id: Id56bd0c16104e46d8dc71f13d8a44aefe251fad4

media/libmediaplayerservice/MediaPlayerService.cpp

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 @@
         p = android::createPlayer(playerType, this, notify);
     }
 
-    p->setUID(mUID);
+    if (p != NULL) {
+        p->setUID(mUID);
+    }
 
     return p;
 }