Merge "Clean up unused debug logs for b/319168409" into main (38b9e143) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/Launcher.java

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -96,9 +96,7 @@ import static com.android.launcher3.popup.SystemShortcut.INSTALL;
	import static com.android.launcher3.popup.SystemShortcut.WIDGETS;		import static com.android.launcher3.popup.SystemShortcut.WIDGETS;
	import static com.android.launcher3.states.RotationHelper.REQUEST_LOCK;		import static com.android.launcher3.states.RotationHelper.REQUEST_LOCK;
	import static com.android.launcher3.states.RotationHelper.REQUEST_NONE;		import static com.android.launcher3.states.RotationHelper.REQUEST_NONE;
	import static com.android.launcher3.testing.shared.TestProtocol.CLOCK_ICON_DRAWABLE_LEAKING;
	import static com.android.launcher3.testing.shared.TestProtocol.LAUNCHER_ACTIVITY_STOPPED_MESSAGE;		import static com.android.launcher3.testing.shared.TestProtocol.LAUNCHER_ACTIVITY_STOPPED_MESSAGE;
	import static com.android.launcher3.testing.shared.TestProtocol.testLogD;
	import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;		import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
	import static com.android.launcher3.util.ItemInfoMatcher.forFolderMatch;		import static com.android.launcher3.util.ItemInfoMatcher.forFolderMatch;
	import static com.android.launcher3.util.SettingsCache.TOUCHPAD_NATURAL_SCROLLING;		import static com.android.launcher3.util.SettingsCache.TOUCHPAD_NATURAL_SCROLLING;
	@@ -424,7 +422,6 @@ public class Launcher extends StatefulActivity<LauncherState>
	@Override		@Override
	@TargetApi(Build.VERSION_CODES.S)		@TargetApi(Build.VERSION_CODES.S)
	protected void onCreate(Bundle savedInstanceState) {		protected void onCreate(Bundle savedInstanceState) {
	testLogD(CLOCK_ICON_DRAWABLE_LEAKING, "onCreate: instance=" + this);
	mStartupLatencyLogger = createStartupLatencyLogger(		mStartupLatencyLogger = createStartupLatencyLogger(
	sIsNewProcess		sIsNewProcess
	? LockedUserState.get(this).isUserUnlockedAtLauncherStartup()		? LockedUserState.get(this).isUserUnlockedAtLauncherStartup()
	@@ -1084,7 +1081,6 @@ public class Launcher extends StatefulActivity<LauncherState>

	@Override		@Override
	protected void onStart() {		protected void onStart() {
	testLogD(CLOCK_ICON_DRAWABLE_LEAKING, "onStart: instance=" + this);
	TraceHelper.INSTANCE.beginSection(ON_START_EVT);		TraceHelper.INSTANCE.beginSection(ON_START_EVT);
	super.onStart();		super.onStart();
	if (!mDeferOverlayCallbacks) {		if (!mDeferOverlayCallbacks) {
	@@ -1098,7 +1094,6 @@ public class Launcher extends StatefulActivity<LauncherState>
	@Override		@Override
	@CallSuper		@CallSuper
	protected void onDeferredResumed() {		protected void onDeferredResumed() {
	testLogD(CLOCK_ICON_DRAWABLE_LEAKING, "onDeferredResumed: instance=" + this);
	logStopAndResume(true /* isResume */);		logStopAndResume(true /* isResume */);

	// Process any items that were added while Launcher was away.		// Process any items that were added while Launcher was away.
	@@ -1282,7 +1277,6 @@ public class Launcher extends StatefulActivity<LauncherState>

	@Override		@Override
	protected void onResume() {		protected void onResume() {
	testLogD(CLOCK_ICON_DRAWABLE_LEAKING, "onResume: instance=" + this);
	TraceHelper.INSTANCE.beginSection(ON_RESUME_EVT);		TraceHelper.INSTANCE.beginSection(ON_RESUME_EVT);
	super.onResume();		super.onResume();

	@@ -1298,7 +1292,6 @@ public class Launcher extends StatefulActivity<LauncherState>

	@Override		@Override
	protected void onPause() {		protected void onPause() {
	testLogD(CLOCK_ICON_DRAWABLE_LEAKING, "onPause: instance=" + this);
	// Ensure that items added to Launcher are queued until Launcher returns		// Ensure that items added to Launcher are queued until Launcher returns
	ItemInstallQueue.INSTANCE.get(this).pauseModelPush(FLAG_ACTIVITY_PAUSED);		ItemInstallQueue.INSTANCE.get(this).pauseModelPush(FLAG_ACTIVITY_PAUSED);

	@@ -1781,7 +1774,6 @@ public class Launcher extends StatefulActivity<LauncherState>

	@Override		@Override
	public void onDestroy() {		public void onDestroy() {
	testLogD(CLOCK_ICON_DRAWABLE_LEAKING, "onDestroy: instance=" + this);
	super.onDestroy();		super.onDestroy();
	ACTIVITY_TRACKER.onActivityDestroyed(this);		ACTIVITY_TRACKER.onActivityDestroyed(this);

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

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -174,7 +174,6 @@ public final class TestProtocol {
	public static final String TEST_DRAG_APP_ICON_TO_MULTIPLE_WORKSPACES_FAILURE = "b/326908466";		public static final String TEST_DRAG_APP_ICON_TO_MULTIPLE_WORKSPACES_FAILURE = "b/326908466";
	public static final String WIDGET_CONFIG_NULL_EXTRA_INTENT = "b/324419890";		public static final String WIDGET_CONFIG_NULL_EXTRA_INTENT = "b/324419890";
	public static final String OVERVIEW_SELECT_TOOLTIP_MISALIGNED = "b/332485341";		public static final String OVERVIEW_SELECT_TOOLTIP_MISALIGNED = "b/332485341";
	public static final String CLOCK_ICON_DRAWABLE_LEAKING = "b/319168409";

	public static final String REQUEST_FLAG_ENABLE_GRID_ONLY_OVERVIEW = "enable-grid-only-overview";		public static final String REQUEST_FLAG_ENABLE_GRID_ONLY_OVERVIEW = "enable-grid-only-overview";
	public static final String REQUEST_FLAG_ENABLE_APP_PAIRS = "enable-app-pairs";		public static final String REQUEST_FLAG_ENABLE_APP_PAIRS = "enable-app-pairs";