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

Commit ef529447 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Adding tracing for workspace loading that never finishes"" into... 

Merge "Revert "Adding tracing for workspace loading that never finishes"" into udc-dev am: 4ad5ffd0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23537958



Change-Id: I79cb2e9daba38366cbf7ae9d8492b25829fc014b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43b4a716 4ad5ffd0

src/com/android/launcher3/model/BaseLauncherBinder.java

+0 −26
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import com.android.launcher3.model.BgDataModel.FixedContainerItems; 
import com.android.launcher3.model.data.AppInfo;

import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.model.data.LauncherAppWidgetInfo;

import com.android.launcher3.testing.shared.TestProtocol;

import com.android.launcher3.util.IntArray;

import com.android.launcher3.util.IntSet;

import com.android.launcher3.util.LooperExecutor;
@@ -282,33 +281,18 @@ public abstract class BaseLauncherBinder { 
            sortWorkspaceItemsSpatially(idp, currentWorkspaceItems);

            sortWorkspaceItemsSpatially(idp, otherWorkspaceItems);



            if (TestProtocol.sDebugTracing) {

                Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "Before posting startBinding");

            }

            // Tell the workspace that we're about to start binding items

            executeCallbacksTask(c -> {

                c.clearPendingBinds();

                c.startBinding();

            }, mUiExecutor);



            if (TestProtocol.sDebugTracing) {

                Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "1");

            }

            // Bind workspace screens

            executeCallbacksTask(c -> c.bindScreens(mOrderedScreenIds), mUiExecutor);



            if (TestProtocol.sDebugTracing) {

                Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "2");

            }

            // Load items on the current page.

            bindWorkspaceItems(currentWorkspaceItems, mUiExecutor);

            if (TestProtocol.sDebugTracing) {

                Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "3");

            }

            bindAppWidgets(currentAppWidgets, mUiExecutor);

            if (TestProtocol.sDebugTracing) {

                Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "4");

            }

            if (!FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) {

                mExtraItems.forEach(item ->

                        executeCallbacksTask(c -> c.bindExtraContainerItems(item), mUiExecutor));
@@ -317,18 +301,8 @@ public abstract class BaseLauncherBinder { 
            RunnableList pendingTasks = new RunnableList();

            Executor pendingExecutor = pendingTasks::add;

            bindWorkspaceItems(otherWorkspaceItems, pendingExecutor);



            if (TestProtocol.sDebugTracing) {

                Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "5");

            }

            bindAppWidgets(otherAppWidgets, pendingExecutor);

            if (TestProtocol.sDebugTracing) {

                Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "6");

            }

            executeCallbacksTask(c -> c.finishBindingItems(currentScreenIds), pendingExecutor);

            if (TestProtocol.sDebugTracing) {

                Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "After posting finishBindingItems");

            }

            pendingExecutor.execute(

                    () -> {

                        MODEL_EXECUTOR.setThreadPriority(Process.THREAD_PRIORITY_DEFAULT);

tests/shared/com/android/launcher3/testing/shared/TestProtocol.java

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ public final class TestProtocol { 
    public static final String PERMANENT_DIAG_TAG = "TaplTarget";

    public static final String WORK_TAB_MISSING = "b/243688989";

    public static final String TWO_TASKBAR_LONG_CLICKS = "b/262282528";

    public static final String WORKSPACE_LOADS_FOREVER = "b/267200150";



    public static final String REQUEST_EMULATE_DISPLAY = "emulate-display";

    public static final String REQUEST_STOP_EMULATE_DISPLAY = "stop-emulate-display";

tests/src/com/android/launcher3/celllayout/ReorderWidgets.java

+0 −4
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import com.android.launcher3.InvariantDeviceProfile; 
import com.android.launcher3.celllayout.testcases.MultipleCellLayoutsSimpleReorder;

import com.android.launcher3.tapl.Widget;

import com.android.launcher3.tapl.WidgetResizeFrame;

import com.android.launcher3.testing.shared.TestProtocol;

import com.android.launcher3.ui.AbstractLauncherUiTest;

import com.android.launcher3.ui.TaplTestsLauncher3;

import com.android.launcher3.util.rule.ShellCommandRule;
@@ -115,11 +114,8 @@ public class ReorderWidgets extends AbstractLauncherUiTest { 
        // resetLoaderState triggers the launcher to start loading the workspace which allows

        // waitForLauncherCondition to wait for that condition, otherwise the condition would

        // always be true and it wouldn't wait for the changes to be applied.

        Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "before resetLoaderState");

        resetLoaderState();

        Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "after resetLoaderState");

        waitForLauncherCondition("Workspace didn't finish loading", l -> !l.isWorkspaceLoading());

        Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "after waitForLauncherCondition");

        Widget widget = mLauncher.getWorkspace().getWidgetAtCell(mainWidgetCellPos.getCellX(),

                mainWidgetCellPos.getCellY());

        assertNotNull(widget);