Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e5bcd4a authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

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

parents a85a74a8 e579e280

media/libmediaplayerservice/MediaPlayerService.cpp

+7 −5
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ 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();

                if (c != 0) {

                    snprintf(buffer, 255, " MediaRecorderClient pid(%d)\n", c->mPid);

                    result.append(buffer);

                    write(fd, result.string(), result.size());
@@ -381,6 +382,7 @@ status_t MediaPlayerService::dump(int fd, const Vector<String16>& args) 
                    c->dump(fd, args);

                }

            }

        }



        result.append(" Files opened and/or mapped:\n");

        snprintf(buffer, SIZE, "/proc/%d/maps", gettid());