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

Merge "Fix hang of adb shell cmd resources dump ..."

Browse Source
This commit is contained in:
Felka Chang
2023-01-13 06:27:37 +00:00
committed by Android (Google) Code Review
parent fd214867e9 953135ffa5
commit ddec7b1f2f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/resources/ResourcesManagerShellCommand.java
View File

@@ -62,13 +62,12 @@ public class ResourcesManagerShellCommand extends ShellCommand {
private int dumpResources() throws RemoteException {
String processId = getNextArgRequired();
try {
try (ParcelFileDescriptor pfd = ParcelFileDescriptor.dup(getOutFileDescriptor())) {
ConditionVariable lock = new ConditionVariable();
RemoteCallback
finishCallback = new RemoteCallback(result -> lock.open(), null);
if (!mInterface.dumpResources(processId,
ParcelFileDescriptor.dup(getOutFileDescriptor()), finishCallback)) {
if (!mInterface.dumpResources(processId, pfd, finishCallback)) {
getErrPrintWriter().println("RESOURCES DUMP FAILED on process " + processId);
return -1;
}