summaryrefslogtreecommitdiff
path: root/src/com/android
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2023-06-02 15:28:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-06-02 15:28:18 +0000
commitd8b470cf2f33f5f1fcfb89a042e558ceba2d953e (patch)
treea6f06767947b72c9888ed0224cd9c100812a322b /src/com/android
parent80bb8a12da54bd7353d923d80ae2934cd5f2350b (diff)
downloadLauncher3-d8b470cf2f33f5f1fcfb89a042e558ceba2d953e.tar.gz
Revert "Adding tracing for workspace loading that never finishes"
This reverts commit 80bb8a12da54bd7353d923d80ae2934cd5f2350b. Reason for revert: Cleanup after the bug is fixed. Tracing is not necessary anymore. Change-Id: I1bb2bc59dd5debb51b094f14430cd18a203ed33c
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/launcher3/model/BaseLauncherBinder.java26
1 files changed, 0 insertions, 26 deletions
diff --git a/src/com/android/launcher3/model/BaseLauncherBinder.java b/src/com/android/launcher3/model/BaseLauncherBinder.java
index 85def73885..ba9eb20073 100644
--- a/src/com/android/launcher3/model/BaseLauncherBinder.java
+++ b/src/com/android/launcher3/model/BaseLauncherBinder.java
@@ -34,7 +34,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;
@@ -268,33 +267,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));
@@ -303,18 +287,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);