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

Merge "[AMS][Bugfix] Fix hang when dumping local cache info." am: 4e52496e7d am: 5d682d6ce3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2450065

Change-Id: Idc0b27466636bc8ef6592c674550f4c5ae64b764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jing Ji
2023-05-10 18:51:47 +00:00
committed by Automerger Merge Worker
parent 3adbf0b4dd 5d682d6ce3
commit 695560e05b
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -10822,6 +10822,13 @@ public class ActivityManagerService extends IActivityManager.Stub
pw.println("\n\n** Cache info for pid " + pid + " [" + r.processName + "] **");
pw.flush();
try {
if (pid == Process.myPid()) {
// Directly dump to target fd for local dump to avoid hang.
try (ParcelFileDescriptor pfd = ParcelFileDescriptor.fromFd(fd.getInt$())) {
thread.dumpCacheInfo(pfd, args);
}
continue;
}
TransferPipe tp = new TransferPipe();
try {
thread.dumpCacheInfo(tp.getWriteFd(), args);