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

Commit 3aad3c0f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Not generating memory dump for intentional leak tests"

parents 7512ab60 abe8e3a9

tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java

+4 −2
Original line number Diff line number Diff line
@@ -126,10 +126,12 @@ public abstract class AbstractLauncherUiTest { 
    private static String getActivityLeakErrorMessage(LauncherInstrumentation launcher) {

        sActivityLeakReported = true;

        return "Activity leak detector has found leaked activities, "

                + dumpHprofData(launcher) + ".";

                + dumpHprofData(launcher, false) + ".";

    }



    public static String dumpHprofData(LauncherInstrumentation launcher) {

    public static String dumpHprofData(LauncherInstrumentation launcher, boolean intentionalLeak) {

        if (intentionalLeak) return "intentional leak; not generating dump";



        String result;

        if (sDumpWasGenerated) {

            Log.d("b/195319692", "dump has already been generated by another test",