PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unused tracing; it confuses investigators" into tm-qpr-dev am: 0bc6491ee7

Browse Source 
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:
Vadim Tryshev
2022-06-24 02:25:56 +00:00
committed by Automerger Merge Worker
parent 93e3d7bb0f 0bc6491ee7
commit 79a71bb7ca
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/com/android/launcher3/util/rule/FailureWatcher.java
-5
View File
@@ -32,7 +32,6 @@ public class FailureWatcher extends TestWatcher {
public FailureWatcher(UiDevice device, LauncherInstrumentation launcher) { public FailureWatcher(UiDevice device, LauncherInstrumentation launcher) {
mDevice = device; mDevice = device;
mLauncher = launcher; mLauncher = launcher;
Log.d("b/196820244", "FailureWatcher.ctor", new Exception());
} }
@Override @Override
@@ -48,10 +47,8 @@ public class FailureWatcher extends TestWatcher {
public void evaluate() throws Throwable { public void evaluate() throws Throwable {
boolean success = false; boolean success = false;
try { try {
Log.d("b/196820244", "Before evaluate");
mDevice.executeShellCommand("cmd statusbar tracing start"); mDevice.executeShellCommand("cmd statusbar tracing start");
FailureWatcher.super.apply(base, description).evaluate(); FailureWatcher.super.apply(base, description).evaluate();
Log.d("b/196820244", "After evaluate");
success = true; success = true;
} finally { } finally {
// Save artifact for Launcher Winscope trace. // Save artifact for Launcher Winscope trace.
@@ -96,9 +93,7 @@ public class FailureWatcher extends TestWatcher {
public static void onError(LauncherInstrumentation launcher, Description description, public static void onError(LauncherInstrumentation launcher, Description description,
Throwable e) { Throwable e) {
final UiDevice device = launcher.getDevice(); final UiDevice device = launcher.getDevice();
Log.d("b/196820244", "onError 1");
if (device == null) return; if (device == null) return;
Log.d("b/196820244", "onError 2");
final File sceenshot = diagFile(description, "TestScreenshot", "png"); final File sceenshot = diagFile(description, "TestScreenshot", "png");
final File hierarchy = diagFile(description, "Hierarchy", "zip"); final File hierarchy = diagFile(description, "Hierarchy", "zip");