diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java index 92c55da6da..3e6def3dfa 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java @@ -111,6 +111,11 @@ public class QuickstepTestInformationHandler extends TestInformationHandler { @Override protected boolean isLauncherInitialized() { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.LAUNCHER_DIDNT_INITIALIZE, + "isLauncherInitialized.TouchInteractionService.isInitialized=" + + TouchInteractionService.isInitialized()); + } return super.isLauncherInitialized() && TouchInteractionService.isInitialized(); } } diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java index 71568b3f14..9580149617 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java @@ -135,6 +135,9 @@ public class TouchInteractionService extends Service implements PluginListener allShortcuts = new ArrayList<>(); loadWorkspace(allShortcuts); @@ -260,6 +278,10 @@ public class LoaderTask implements Runnable { updateHandler.finish(); logger.addSplit("finish icon update"); + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.LAUNCHER_DIDNT_INITIALIZE, + "LoaderTask3 " + this); + } transaction.commit(); } catch (CancellationException e) { // Loader stopped, ignore diff --git a/src/com/android/launcher3/testing/TestInformationHandler.java b/src/com/android/launcher3/testing/TestInformationHandler.java index 506830d531..4af5e0a2ef 100644 --- a/src/com/android/launcher3/testing/TestInformationHandler.java +++ b/src/com/android/launcher3/testing/TestInformationHandler.java @@ -25,6 +25,7 @@ import android.graphics.Color; import android.os.Bundle; import android.os.Debug; import android.system.Os; +import android.util.Log; import android.view.View; import androidx.annotation.Keep; @@ -190,6 +191,11 @@ public class TestInformationHandler implements ResourceBasedOverride { } protected boolean isLauncherInitialized() { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.LAUNCHER_DIDNT_INITIALIZE, + "isLauncherInitialized " + Launcher.ACTIVITY_TRACKER.getCreatedActivity() + ", " + + LauncherAppState.getInstance(mContext).getModel().isModelLoaded()); + } return Launcher.ACTIVITY_TRACKER.getCreatedActivity() == null || LauncherAppState.getInstance(mContext).getModel().isModelLoaded(); } diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java index 01c207f907..2fd1b2ffc4 100644 --- a/src/com/android/launcher3/testing/TestProtocol.java +++ b/src/com/android/launcher3/testing/TestProtocol.java @@ -89,4 +89,5 @@ public final class TestProtocol { public static final String NO_BACKGROUND_TO_OVERVIEW_TAG = "b/138251824"; public static final String APP_NOT_DISABLED = "b/139891609"; + public static final String LAUNCHER_DIDNT_INITIALIZE = "b/148313079"; } diff --git a/src/com/android/launcher3/util/ActivityTracker.java b/src/com/android/launcher3/util/ActivityTracker.java index 499f655df1..b83c8fca29 100644 --- a/src/com/android/launcher3/util/ActivityTracker.java +++ b/src/com/android/launcher3/util/ActivityTracker.java @@ -45,7 +45,13 @@ public final class ActivityTracker implements Runnable { } public void onActivityDestroyed(T activity) { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.LAUNCHER_DIDNT_INITIALIZE, "onActivityDestroyed"); + } if (mCurrentActivity.get() == activity) { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.LAUNCHER_DIDNT_INITIALIZE, "onActivityDestroyed: clear"); + } mCurrentActivity.clear(); } } @@ -110,6 +116,10 @@ public final class ActivityTracker implements Runnable { } public boolean handleCreate(T activity) { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.LAUNCHER_DIDNT_INITIALIZE, + "ActivityTracker.handleCreate " + mCurrentActivity.get() + " => " + activity); + } mCurrentActivity = new WeakReference<>(activity); return handleIntent(activity, activity.getIntent(), false, false); }