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

Commit 8ebf5ba9 authored by Christopher Tate's avatar Christopher Tate Committed by Automerger Merge Worker
Browse files

Fix side effects of trace-ipc and dumpheap commands am: 4c0b9a5f am: 5518a714 am: cb8e4e8d 

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

Change-Id: I65246cca8e1b07d7005ef298505e2dd688d22ced
parents e51f884f cb8e4e8d

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

+2 −5
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ import com.android.internal.util.MemInfoReader; 
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;
@@ -787,8 +786,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;
@@ -945,8 +943,7 @@ final class ActivityManagerShellCommand extends ShellCommand { 
        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;