Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec280a20 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix side effects of trace-ipc and dumpheap commands" into rvc-dev am: 0e1054f0 

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

Change-Id: I8b82cf1b05bdff8ceec7c70a0ebfbede0fa3c5a0
parents 98c35c47 0e1054f0

services/core/java/com/android/server/am/ActivityManagerShellCommand.java

+3 −2
Original line number Diff line number Diff line
@@ -940,8 +940,6 @@ final class ActivityManagerShellCommand extends ShellCommand { 
            String logNameTimeString = LOG_NAME_TIME_FORMATTER.format(localDateTime);

            heapFile = "/data/local/tmp/heapdump-" + logNameTimeString + ".prof";

        }

        pw.println("File: " + heapFile);

        pw.flush();



        // Writes an error message to stderr on failure

        ParcelFileDescriptor fd = openFileForSystem(heapFile, "w");
@@ -949,6 +947,9 @@ final class ActivityManagerShellCommand extends ShellCommand { 
            return -1;

        }



        pw.println("File: " + heapFile);

        pw.flush();



        final CountDownLatch latch = new CountDownLatch(1);



        final RemoteCallback finishCallback = new RemoteCallback(new OnResultListener() {