diff options
| author | Dave Sparks <davidsparks@android.com> | 2010-09-28 08:52:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 08:52:23 -0700 |
| commit | 7dff9dfd6176fad1318a27f16318561453a429f0 (patch) | |
| tree | b0ab0f16b411f08649ee7d8ea6ebc492e302eeb7 /media | |
| parent | f7e13400b24bdc5461e640cfb2c9cb2bbb2b6236 (diff) | |
| parent | 269dea1c48640ec2bf5a4e9de851cac2dbfbafd1 (diff) | |
| download | frameworks_base-7dff9dfd6176fad1318a27f16318561453a429f0.zip frameworks_base-7dff9dfd6176fad1318a27f16318561453a429f0.tar.gz frameworks_base-7dff9dfd6176fad1318a27f16318561453a429f0.tar.bz2 | |
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 '269dea1c48640ec2bf5a4e9de851cac2dbfbafd1' into gingerbread-plus-aosp
* commit '269dea1c48640ec2bf5a4e9de851cac2dbfbafd1':
Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669.
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); |