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

Commit 35b96bf0 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 sc-dev am:... 

Merge "Fix side effects of trace-ipc and dumpheap commands" into sc-dev am: 3ab0caf4 am: b35f1b2e

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

Change-Id: I54fa2e1bdbf84373ba31f55d327252c206d4103c
parents 512986e3 b35f1b2e

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

+5 −7
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ import com.android.server.am.LowMemDetector.MemFactor; 
import com.android.server.compat.PlatformCompat;



import java.io.BufferedReader;

import java.io.File;

import java.io.IOException;

import java.io.InputStream;

import java.io.InputStreamReader;
@@ -806,8 +805,7 @@ final class ActivityManagerShellCommand extends ShellCommand { 
            return -1;

        }



        File file = new File(filename);

        file.delete();

        // Writes an error message to stderr on failure

        ParcelFileDescriptor fd = openFileForSystem(filename, "w");

        if (fd == null) {

            return -1;
@@ -961,16 +959,16 @@ 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();



        File file = new File(heapFile);

        file.delete();

        // Writes an error message to stderr on failure

        ParcelFileDescriptor fd = openFileForSystem(heapFile, "w");

        if (fd == null) {

            return -1;

        }



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

        pw.flush();



        final CountDownLatch latch = new CountDownLatch(1);



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