Merge "Add debug logs for b/321775748" into main (cbdf4d3e) · Commits · e / os / BlissLauncher3

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

+23 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static androidx.test.InstrumentationRegistry.getInstrumentation;
		import static com.android.launcher3.tapl.LauncherInstrumentation.WAIT_TIME_MS;
		import static com.android.launcher3.tapl.TestHelpers.getHomeIntentInPackage;
		import static com.android.launcher3.tapl.TestHelpers.getLauncherInMyProcess;
		import static com.android.launcher3.testing.shared.TestProtocol.UPDATE_OVERVIEW_TARGETS_RUNNING_LATE;
		import static com.android.launcher3.ui.AbstractLauncherUiTest.DEFAULT_ACTIVITY_TIMEOUT;
		import static com.android.launcher3.ui.AbstractLauncherUiTest.DEFAULT_BROADCAST_TIMEOUT_SECS;
		import static com.android.launcher3.ui.AbstractLauncherUiTest.DEFAULT_UI_TIMEOUT;
		@@ -44,6 +45,7 @@ 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;
		@@ -133,6 +135,13 @@ public class FallbackRecentsTest {
		getLauncherCommand(mOtherLauncherActivity));
		updateHandler.mChangeCounter
		.await(DEFAULT_BROADCAST_TIMEOUT_SECS, TimeUnit.SECONDS);
		Log.d(UPDATE_OVERVIEW_TARGETS_RUNNING_LATE,
		"AFTER AWAIT: mObserver home intent package name="
		+ updateHandler.mObserver.getHomeIntent()
		.getComponent().getPackageName());
		Log.d(UPDATE_OVERVIEW_TARGETS_RUNNING_LATE,
		"AFTER AWAIT: mOtherLauncherActivity package name="
		+ mOtherLauncherActivity.packageName);
		try {
		base.evaluate();
		} finally {
		@@ -344,12 +353,25 @@ public class FallbackRecentsTest {
		mRads = new RecentsAnimationDeviceState(ctx);
		mObserver = new OverviewComponentObserver(ctx, mRads);
		mChangeCounter = new CountDownLatch(1);
		Log.d(UPDATE_OVERVIEW_TARGETS_RUNNING_LATE,
		"OverviewUpdateHandler(Constructor): mObserver home intent package name="
		+ mObserver.getHomeIntent().getComponent().getPackageName());
		Log.d(UPDATE_OVERVIEW_TARGETS_RUNNING_LATE,
		"OverviewUpdateHandler(Constructor): mOtherLauncherActivity package name="
		+ mOtherLauncherActivity.packageName);
		if (mObserver.getHomeIntent().getComponent()
		.getPackageName().equals(mOtherLauncherActivity.packageName)) {
		// Home already same
		mChangeCounter.countDown();
		} else {
		mObserver.setOverviewChangeListener(b -> mChangeCounter.countDown());
		mObserver.setOverviewChangeListener(b -> {
		Log.d(UPDATE_OVERVIEW_TARGETS_RUNNING_LATE,
		"OverviewChangeListener(Callback): isHomeAndOverviewSame=" + b);
		Log.d(UPDATE_OVERVIEW_TARGETS_RUNNING_LATE,
		"OverviewChangeListener(Callback): mObserver home intent package name="
		+ mObserver.getHomeIntent().getComponent().getPackageName());
		mChangeCounter.countDown();
		});
		}
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,7 @@ public final class TestProtocol {
		public static final String TEST_TAPL_OVERVIEW_ACTIONS_MENU_FAILURE = "b/326073471";
		public static final String WIDGET_CONFIG_NULL_EXTRA_INTENT = "b/324419890";
		public static final String ACTIVITY_NOT_RESUMED_AFTER_BACK = "b/322823209";
		public static final String UPDATE_OVERVIEW_TARGETS_RUNNING_LATE = "b/321775748";

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