Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix side effects of trace-ipc and dumpheap commands am: 4c0b9a5fbd am: 5518a714f3

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

Change-Id: I2cd91b0de1757c122625b2535a10b5092d57d42a
This commit is contained in:
Christopher Tate
2021-06-25 18:12:21 +00:00
committed by Automerger Merge Worker
parent ffdad637f3 5518a714f3
commit cb8e4e8db6
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/am/ActivityManagerShellCommand.java
View File

@@ -90,7 +90,6 @@ import com.android.internal.util.MemInfoReader;
import com.android.internal.util.Preconditions;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -759,8 +758,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;
@@ -917,8 +915,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;