commit 2e5bcd4a0d1f3078acfd88785aa29923ae03a3bb
author James Dong <jdong@google.com> Wed Oct 19 17:55:45 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 19 17:55:45 2011 -0700
tree 6e32c80b68cd66ab3db4de2d5d1c45500e1724d5
parent a85a74a8219c03f2b1d1ef98f3f02e55f89f89a3
parent e579e28089c6b86f56d257030b778c5e22b1a5a5

Merge "Check whether media recorder client exists before dumping." into ics-mr0

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index b5eef94..3ebe989 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -374,11 +374,13 @@
         } else {
             for (int i = 0, n = mMediaRecorderClients.size(); i < n; ++i) {
                 sp<MediaRecorderClient> c = mMediaRecorderClients[i].promote();
-                snprintf(buffer, 255, " MediaRecorderClient pid(%d)\n", c->mPid);
-                result.append(buffer);
-                write(fd, result.string(), result.size());
-                result = "\n";
-                c->dump(fd, args);
+                if (c != 0) {
+                    snprintf(buffer, 255, " MediaRecorderClient pid(%d)\n", c->mPid);
+                    result.append(buffer);
+                    write(fd, result.string(), result.size());
+                    result = "\n";
+                    c->dump(fd, args);
+                }
             }
         }