Merge "Fix side effects of trace-ipc and dumpheap commands" into qt-dev

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

@@ -912,8 +912,6 @@ final class ActivityManagerShellCommand extends ShellCommand {
             t.set(System.currentTimeMillis());
             heapFile = "/data/local/tmp/heapdump-" + t.format("%Y%m%d-%H%M%S") + ".prof";
         }
-        pw.println("File: " + heapFile);
-        pw.flush();
 
         // Writes an error message to stderr on failure
         ParcelFileDescriptor fd = openFileForSystem(heapFile, "w");
@@ -921,6 +919,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() {