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

Commit 7dff9dfd authored by Dave Sparks's avatar Dave Sparks Committed by Android Git Automerger
Browse files

am 269dea1c: Merge "Fix media.player dumpsys to output open/mapped files... 

am 269dea1c: Merge "Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669. The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that were open on t

Merge commit '269dea1c' into gingerbread-plus-aosp

* commit '269dea1c':
  Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669.
parents f7e13400 269dea1c

media/libmediaplayerservice/MediaPlayerService.cpp

+4 −2
Original line number Diff line number Diff line
@@ -534,8 +534,9 @@ status_t MediaPlayerService::dump(int fd, const Vector<String16>& args) 
        if (f) {

            while (!feof(f)) {

                fgets(buffer, SIZE, f);

                if (strstr(buffer, " /sdcard/") ||

                if (strstr(buffer, " /mnt/sdcard/") ||

                    strstr(buffer, " /system/sounds/") ||

                    strstr(buffer, " /data/") ||

                    strstr(buffer, " /system/media/")) {

                    result.append("  ");

                    result.append(buffer);
@@ -569,8 +570,9 @@ status_t MediaPlayerService::dump(int fd, const Vector<String16>& args) 
                                } else {

                                    linkto[len] = 0;

                                }

                                if (strstr(linkto, "/sdcard/") == linkto ||

                                if (strstr(linkto, "/mnt/sdcard/") == linkto ||

                                    strstr(linkto, "/system/sounds/") == linkto ||

                                    strstr(linkto, "/data/") == linkto ||

                                    strstr(linkto, "/system/media/") == linkto) {

                                    result.append("  ");

                                    result.append(buffer);