Merge "Fix side effects of trace-ipc and dumpheap commands" into sc-dev (3ab0caf4) · Commits · e / os / android_frameworks_base

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() {