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 qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-25 18:33:18 +00:00
committed by Android (Google) Code Review
parent 5518a714f3 3555fa2f09
commit 956fe588a7
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

@@ -912,8 +912,6 @@ final class ActivityManagerShellCommand extends ShellCommand {
t.set(System.currentTimeMillis()); t.set(System.currentTimeMillis());
heapFile = "/data/local/tmp/heapdump-" + t.format("%Y%m%d-%H%M%S") + ".prof"; heapFile = "/data/local/tmp/heapdump-" + t.format("%Y%m%d-%H%M%S") + ".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");
@@ -921,6 +919,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() {