Merge "Remove tracing for a non-repro flake" into ub-launcher3-master (087b3fec) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/pm/UserCache.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -21,10 +21,8 @@ import android.content.Intent;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.util.ArrayMap;
		import android.util.Log;
		import android.util.LongSparseArray;

		import com.android.launcher3.testing.TestProtocol;
		import com.android.launcher3.util.MainThreadInitializedObject;
		import com.android.launcher3.util.SafeCloseable;
		import com.android.launcher3.util.SimpleBroadcastReceiver;
		@@ -104,9 +102,6 @@ public class UserCache {
		mUsers = null;
		mUserToSerialMap = null;
		}
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.WORK_PROFILE_REMOVED, "Work profile removed", new Exception());
		}
		}
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -106,5 +106,4 @@ public final class TestProtocol {
		public static final String PAUSE_NOT_DETECTED = "b/139891609";
		public static final String OVERIEW_NOT_ALLAPPS = "b/156095088";
		public static final String NO_SWIPE_TO_HOME = "b/158017601";
		public static final String WORK_PROFILE_REMOVED = "b/159671700";
		}

+0 −5

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue;
		import android.os.Process;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.util.Log;
		import android.widget.TextView;

		import androidx.test.filters.LargeTest;
		@@ -35,7 +34,6 @@ import com.android.launcher3.allapps.AllAppsContainerView;
		import com.android.launcher3.allapps.AllAppsPagedView;
		import com.android.launcher3.allapps.WorkModeSwitch;
		import com.android.launcher3.dragndrop.DragLayer;
		import com.android.launcher3.testing.TestProtocol;
		import com.android.launcher3.views.WorkEduView;

		import org.junit.After;
		@@ -135,9 +133,6 @@ public class WorkTabTest extends AbstractLauncherUiTest {
		workEduView.findViewById(R.id.proceed).callOnClick();
		});

		executeOnLauncher(launcher -> Log.d(TestProtocol.WORK_PROFILE_REMOVED,
		"Work profile status: " + launcher.getAppsView().isPersonalTabVisible()));

		// verify work edu is seen next
		waitForLauncherCondition("Launcher did not show the next edu screen", l ->
		((AllAppsPagedView) l.getAppsView().getContentView()).getCurrentPage() == WORK_PAGE