From 00213384610d4b1c51796e8173a55f31df1cee1d Mon Sep 17 00:00:00 2001 From: Schneider Victor-tulias Date: Mon, 27 Sep 2021 13:41:10 -0700 Subject: [PATCH] Add logging to help debug b/200572078. Bug: 200572078 Test: ran launcher and checked logs Change-Id: If59d850021df226d645aa6a72da2b5bb7ec63782 --- src/com/android/launcher3/Launcher.java | 8 ++++++++ .../android/launcher3/model/BaseLoaderResults.java | 11 +++++++++++ src/com/android/launcher3/model/ModelUtils.java | 5 +++++ src/com/android/launcher3/testing/TestProtocol.java | 1 + 4 files changed, 25 insertions(+) diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 409ee83782..467e080141 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2124,6 +2124,10 @@ public class Launcher extends StatefulActivity implements Launche IntSet result = new IntSet(); if (visibleIds.isEmpty()) { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NULL_INT_SET, "getPagesToBindSynchronously (1): " + + result); + } return result; } for (int id : orderedScreenIds.toArray()) { @@ -2144,6 +2148,10 @@ public class Launcher extends StatefulActivity implements Launche // pages being hidden in single panel. result.add(pairId); } + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NULL_INT_SET, "getPagesToBindSynchronously (2): " + + result); + } return result; } diff --git a/src/com/android/launcher3/model/BaseLoaderResults.java b/src/com/android/launcher3/model/BaseLoaderResults.java index 0e132c2dad..e9feb1cafd 100644 --- a/src/com/android/launcher3/model/BaseLoaderResults.java +++ b/src/com/android/launcher3/model/BaseLoaderResults.java @@ -32,6 +32,7 @@ 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.TestProtocol; import com.android.launcher3.util.IntArray; import com.android.launcher3.util.IntSet; import com.android.launcher3.util.LooperExecutor; @@ -173,8 +174,18 @@ public abstract class BaseLoaderResults { ArrayList currentAppWidgets = new ArrayList<>(); ArrayList otherAppWidgets = new ArrayList<>(); + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NULL_INT_SET, "bind (1) currentScreenIds: " + + currentScreenIds + + ", mCallBacks: " + + mCallbacks.getClass().getSimpleName()); + } filterCurrentWorkspaceItems(currentScreenIds, mWorkspaceItems, currentWorkspaceItems, otherWorkspaceItems); + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NULL_INT_SET, "bind (2) currentScreenIds: " + + currentScreenIds); + } filterCurrentWorkspaceItems(currentScreenIds, mAppWidgets, currentAppWidgets, otherAppWidgets); final InvariantDeviceProfile idp = mApp.getInvariantDeviceProfile(); diff --git a/src/com/android/launcher3/model/ModelUtils.java b/src/com/android/launcher3/model/ModelUtils.java index 58aa9e591f..ef5eef1e43 100644 --- a/src/com/android/launcher3/model/ModelUtils.java +++ b/src/com/android/launcher3/model/ModelUtils.java @@ -31,6 +31,7 @@ import com.android.launcher3.icons.BitmapInfo; import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; +import com.android.launcher3.testing.TestProtocol; import com.android.launcher3.util.IntArray; import com.android.launcher3.util.IntSet; @@ -66,6 +67,10 @@ public class ModelUtils { (lhs, rhs) -> Integer.compare(lhs.container, rhs.container)); for (T info : allWorkspaceItems) { if (info.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NULL_INT_SET, "filterCurrentWorkspaceItems: " + + currentScreenIds); + } if (currentScreenIds.contains(info.screenId)) { currentScreenItems.add(info); itemsOnScreen.add(info.id); diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java index 3aecaa58f7..1d73d037fa 100644 --- a/src/com/android/launcher3/testing/TestProtocol.java +++ b/src/com/android/launcher3/testing/TestProtocol.java @@ -118,4 +118,5 @@ public final class TestProtocol { public static final String WORK_PROFILE_REMOVED = "b/159671700"; public static final String TASK_VIEW_ID_CRASH = "b/195430732"; public static final String NO_DROP_TARGET = "b/195031154"; + public static final String NULL_INT_SET = "b/200572078"; }