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 am: 0e1054f01e

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

Change-Id: I52cbcd6b7f63706a83e5108537699b4595c3697f
This commit is contained in:
TreeHugger Robot
2021-06-25 21:25:28 +00:00
committed by Automerger Merge Worker
parent 84d09ab4d3 0e1054f01e
commit 530bdb4290
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() {