diff options
| author | Dave Sparks <davidsparks@android.com> | 2010-09-28 08:44:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-28 08:44:39 -0700 |
| commit | 269dea1c48640ec2bf5a4e9de851cac2dbfbafd1 (patch) | |
| tree | 8fb7ccf7a5be354f1e1f33b44f0a202aa50a6ebe /media | |
| parent | 624d5b4e8c20516516d0bff74479b9f5abdfe61c (diff) | |
| parent | 124a346c7ae24a42048ab1a42f001832f9de9574 (diff) | |
| download | frameworks_base-269dea1c48640ec2bf5a4e9de851cac2dbfbafd1.zip frameworks_base-269dea1c48640ec2bf5a4e9de851cac2dbfbafd1.tar.gz frameworks_base-269dea1c48640ec2bf5a4e9de851cac2dbfbafd1.tar.bz2 | |
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 the SD card. This fix changes the filter for the SD card, and adds the directory for data files as well." into gingerbread
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index aba5f52..d975cb9 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -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); |