diff options
author | James Dong <jdong@google.com> | 2011-10-19 17:57:58 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-19 17:57:58 -0700 |
commit | d24bac2f9e83d3dbc0ef9d2aae3b8ad8e4d2b731 (patch) | |
tree | e653b32aa31661e403d313439e1f2d6914cc9fb6 /media | |
parent | 545d1e935b8ee12255bbd443a89a4b8ec2aeeb35 (diff) | |
parent | 2e5bcd4a0d1f3078acfd88785aa29923ae03a3bb (diff) | |
download | frameworks_av-d24bac2f9e83d3dbc0ef9d2aae3b8ad8e4d2b731.zip frameworks_av-d24bac2f9e83d3dbc0ef9d2aae3b8ad8e4d2b731.tar.gz frameworks_av-d24bac2f9e83d3dbc0ef9d2aae3b8ad8e4d2b731.tar.bz2 |
am b3cdadb6: Merge "Check whether media recorder client exists before dumping." into ics-mr0
* commit 'b3cdadb639027f62c7c1637ca962a70d2d1f3b4d':
Check whether media recorder client exists before dumping.
Diffstat (limited to 'media')
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 24e1bfb..2ea2af9 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -374,11 +374,13 @@ status_t MediaPlayerService::dump(int fd, const Vector<String16>& args) } 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); + } } } |