commit d9792ac752f10a865efe2742b600b4448a821dca
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 2ff83038165418746141143402e4b0ef56c8463e
parent e1fec2408b41cdbc39003398c38537ef95af94ab

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;
 }