Merge "Removing legacy launcher winscope tracing for tests" into udc-dev

This commit is contained in:
Winson Chung
2023-05-23 18:47:40 +00:00
committed by Android (Google) Code Review

View File

@@ -2,7 +2,6 @@ package com.android.launcher3.util.rule;
import static androidx.test.InstrumentationRegistry.getInstrumentation;
import android.content.Context;
import android.os.FileUtils;
import android.os.ParcelFileDescriptor.AutoCloseInputStream;
import android.util.Log;
@@ -54,27 +53,9 @@ public class FailureWatcher extends TestWatcher {
return new Statement() {
@Override
public void evaluate() throws Throwable {
boolean success = false;
try {
mDevice.executeShellCommand("cmd statusbar tracing start");
FailureWatcher.super.apply(base, description).evaluate();
success = true;
} finally {
// Save artifact for Launcher Winscope trace.
mDevice.executeShellCommand("cmd statusbar tracing stop");
final Context nexusLauncherContext =
getInstrumentation().getTargetContext()
.createPackageContext("com.google.android.apps.nexuslauncher",
0);
final File launcherTrace =
new File(nexusLauncherContext.getFilesDir(), "launcher_trace.pb");
if (success) {
mDevice.executeShellCommand("rm " + launcherTrace);
} else {
mDevice.executeShellCommand("mv " + launcherTrace + " "
+ diagFile(description, "LauncherWinscope", "pb"));
}
// Detect touch events coming from physical screen.
if (mLauncher.hadNontestEvents()) {
throw new AssertionError(