Merge "Remove unused tracing; it confuses investigators" into tm-qpr-dev am: 0bc6491ee7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19033082 Change-Id: I6c6cf3b50a3e81d7873d6ce66ba8a63d75a0cc96 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -32,7 +32,6 @@ public class FailureWatcher extends TestWatcher {
|
||||
public FailureWatcher(UiDevice device, LauncherInstrumentation launcher) {
|
||||
mDevice = device;
|
||||
mLauncher = launcher;
|
||||
Log.d("b/196820244", "FailureWatcher.ctor", new Exception());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -48,10 +47,8 @@ public class FailureWatcher extends TestWatcher {
|
||||
public void evaluate() throws Throwable {
|
||||
boolean success = false;
|
||||
try {
|
||||
Log.d("b/196820244", "Before evaluate");
|
||||
mDevice.executeShellCommand("cmd statusbar tracing start");
|
||||
FailureWatcher.super.apply(base, description).evaluate();
|
||||
Log.d("b/196820244", "After evaluate");
|
||||
success = true;
|
||||
} finally {
|
||||
// Save artifact for Launcher Winscope trace.
|
||||
@@ -96,9 +93,7 @@ public class FailureWatcher extends TestWatcher {
|
||||
public static void onError(LauncherInstrumentation launcher, Description description,
|
||||
Throwable e) {
|
||||
final UiDevice device = launcher.getDevice();
|
||||
Log.d("b/196820244", "onError 1");
|
||||
if (device == null) return;
|
||||
Log.d("b/196820244", "onError 2");
|
||||
final File sceenshot = diagFile(description, "TestScreenshot", "png");
|
||||
final File hierarchy = diagFile(description, "Hierarchy", "zip");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user