Skip to content

Commit b3cdadb

Browse files
James DongAndroid (Google) Code Review
authored andcommitted
Merge "Check whether media recorder client exists before dumping." into ics-mr0
2 parents 1636204 + dc8bbe7 commit b3cdadb

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

media/libmediaplayerservice/MediaPlayerService.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -374,11 +374,13 @@ status_t MediaPlayerService::dump(int fd, const Vector<String16>& args)
374374
} else {
375375
for (int i = 0, n = mMediaRecorderClients.size(); i < n; ++i) {
376376
sp<MediaRecorderClient> c = mMediaRecorderClients[i].promote();
377-
snprintf(buffer, 255, " MediaRecorderClient pid(%d)\n", c->mPid);
378-
result.append(buffer);
379-
write(fd, result.string(), result.size());
380-
result = "\n";
381-
c->dump(fd, args);
377+
if (c != 0) {
378+
snprintf(buffer, 255, " MediaRecorderClient pid(%d)\n", c->mPid);
379+
result.append(buffer);
380+
write(fd, result.string(), result.size());
381+
result = "\n";
382+
c->dump(fd, args);
383+
}
382384
}
383385
}
384386

0 commit comments

Comments
 (0)