Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '269dea1c48640ec2bf5a4e9de851cac2dbfbafd1' into gingerbread-plus-aosp

* commit '269dea1c48640ec2bf5a4e9de851cac2dbfbafd1':
  Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669.
This commit is contained in:
Dave Sparks
2010-09-28 08:52:23 -07:00
committed by Android Git Automerger
parent f7e13400b2 269dea1c48
commit 7dff9dfd61
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/libmediaplayerservice/MediaPlayerService.cpp
View File

@@ -534,8 +534,9 @@ status_t MediaPlayerService::dump(int fd, const Vector<String16>& args)
if (f) { if (f) {
while (!feof(f)) { while (!feof(f)) {
fgets(buffer, SIZE, f); fgets(buffer, SIZE, f);
if (strstr(buffer, " /sdcard/") || if (strstr(buffer, " /mnt/sdcard/") ||
strstr(buffer, " /system/sounds/") || strstr(buffer, " /system/sounds/") ||
strstr(buffer, " /data/") ||
strstr(buffer, " /system/media/")) { strstr(buffer, " /system/media/")) {
result.append(" "); result.append(" ");
result.append(buffer); result.append(buffer);
@@ -569,8 +570,9 @@ status_t MediaPlayerService::dump(int fd, const Vector<String16>& args)
} else { } else {
linkto[len] = 0; linkto[len] = 0;
} }
if (strstr(linkto, "/sdcard/") == linkto || if (strstr(linkto, "/mnt/sdcard/") == linkto ||
strstr(linkto, "/system/sounds/") == linkto || strstr(linkto, "/system/sounds/") == linkto ||
strstr(linkto, "/data/") == linkto ||
strstr(linkto, "/system/media/") == linkto) { strstr(linkto, "/system/media/") == linkto) {
result.append(" "); result.append(" ");
result.append(buffer); result.append(buffer);