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

Commit 72da449f authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Removing unused tracing" into sc-v2-dev

parents 25a1e0b9 4e743887

quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java

+0 −8
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import android.content.Context; 
import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.os.RemoteException;

import android.util.Log;



import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;
@@ -56,7 +55,6 @@ import com.android.launcher3.tapl.LauncherInstrumentation; 
import com.android.launcher3.tapl.OverviewTask;

import com.android.launcher3.tapl.TestHelpers;

import com.android.launcher3.testcomponent.TestCommandReceiver;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.util.Wait;

import com.android.launcher3.util.rule.FailureWatcher;

import com.android.quickstep.views.RecentsView;
@@ -188,15 +186,9 @@ public class FallbackRecentsTest { 


    protected <T> T getFromRecents(Function<RecentsActivity, T> f) {

        if (!TestHelpers.isInLauncherProcess()) return null;

        if (TestProtocol.sDebugTracing) {

            Log.d(TestProtocol.FALLBACK_ACTIVITY_NO_SET, "getFromRecents");

        }

        Object[] result = new Object[1];

        Wait.atMost("Failed to get from recents", () -> MAIN_EXECUTOR.submit(() -> {

            RecentsActivity activity = RecentsActivity.ACTIVITY_TRACKER.getCreatedActivity();

            if (TestProtocol.sDebugTracing) {

                Log.d(TestProtocol.FALLBACK_ACTIVITY_NO_SET, "activity=" + activity);

            }

            if (activity == null) {

                return false;

            }

src/com/android/launcher3/testing/TestProtocol.java

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ public final class TestProtocol { 


    public static final String PERMANENT_DIAG_TAG = "TaplTarget";

    public static final String WORK_PROFILE_REMOVED = "b/159671700";

    public static final String FALLBACK_ACTIVITY_NO_SET = "b/181019015";

    public static final String TASK_VIEW_ID_CRASH = "b/195430732";

    public static final String L3_SWIPE_TO_HOME = "b/192018189";

    public static final String NO_DROP_TARGET = "b/195031154";