Automated import from //branches/donutburger/...@141593,141593
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 40705c6..31eecac 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -456,6 +456,7 @@
         Mutex::Autolock l(mLock);
         p = mPlayer;
     }
+    mClient.clear();
     mPlayer.clear();
 
     // clear the notification to prevent callbacks to dead client