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

Merge "Fix side effects of trace-ipc and dumpheap commands" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-25 21:09:28 +00:00
committed by Android (Google) Code Review
parent 6eb12245ef 76e8e04703
commit 0e1054f01e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/ActivityManagerShellCommand.java
View File

@@ -940,8 +940,6 @@ final class ActivityManagerShellCommand extends ShellCommand {
String logNameTimeString = LOG_NAME_TIME_FORMATTER.format(localDateTime); String logNameTimeString = LOG_NAME_TIME_FORMATTER.format(localDateTime);
heapFile = "/data/local/tmp/heapdump-" + logNameTimeString + ".prof"; heapFile = "/data/local/tmp/heapdump-" + logNameTimeString + ".prof";
} }
pw.println("File: " + heapFile);
pw.flush();
// Writes an error message to stderr on failure // Writes an error message to stderr on failure
ParcelFileDescriptor fd = openFileForSystem(heapFile, "w"); ParcelFileDescriptor fd = openFileForSystem(heapFile, "w");
@@ -949,6 +947,9 @@ final class ActivityManagerShellCommand extends ShellCommand {
return -1; return -1;
} }
pw.println("File: " + heapFile);
pw.flush();
final CountDownLatch latch = new CountDownLatch(1); final CountDownLatch latch = new CountDownLatch(1);
final RemoteCallback finishCallback = new RemoteCallback(new OnResultListener() { final RemoteCallback finishCallback = new RemoteCallback(new OnResultListener() {