diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index 075505eb93..3e98983daa 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -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",