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

Commit 19b728ba authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "am dumpheap throws error when arguments are after file" into main am: 7e0989d9 

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



Change-Id: Ie031827dd6113bc0ffd89fd8f6b09c4490f8fb24
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9db8c9c4 7e0989d9

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

+6 −0
Original line number Diff line number Diff line
@@ -1353,6 +1353,12 @@ final class ActivityManagerShellCommand extends ShellCommand { 
            heapFile = "/data/local/tmp/heapdump-" + logNameTimeString + ".prof";

        }



        String argAfterHeapFile = getNextArg();

        if (argAfterHeapFile != null) {

            err.println("Error: Arguments cannot be placed after the heap file");

            return -1;

        }



        // Writes an error message to stderr on failure

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

        if (fd == null) {