From dae8b65dea6bceafbcf225ffb691f2ec6ab281d0 Mon Sep 17 00:00:00 2001 From: Vadim Tryshev Date: Mon, 26 Feb 2024 17:48:51 -0800 Subject: [PATCH] Removing logging for verifying internal Launcher state from tests Bug: 322823209 Test: presubmit Flag: N/A Change-Id: I25afcc30446d429171445f8e1b6033b277166725 --- src/com/android/launcher3/BaseActivity.java | 6 ------ .../com/android/launcher3/testing/shared/TestProtocol.java | 1 - 2 files changed, 7 deletions(-) diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java index acfc5e40ca..1049314016 100644 --- a/src/com/android/launcher3/BaseActivity.java +++ b/src/com/android/launcher3/BaseActivity.java @@ -16,8 +16,6 @@ package com.android.launcher3; -import static com.android.launcher3.testing.shared.TestProtocol.ACTIVITY_NOT_RESUMED_AFTER_BACK; -import static com.android.launcher3.testing.shared.TestProtocol.sDebugTracing; import static com.android.launcher3.util.FlagDebugUtils.appendFlag; import static com.android.launcher3.util.FlagDebugUtils.formatFlagChange; import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK; @@ -310,9 +308,6 @@ public abstract class BaseActivity extends Activity implements ActivityContext { * Sets the activity to appear as paused. */ public void setPaused() { - if (sDebugTracing) { - Log.d(ACTIVITY_NOT_RESUMED_AFTER_BACK, "Activity setPaused: " + this, new Throwable()); - } removeActivityFlags(ACTIVITY_STATE_RESUMED | ACTIVITY_STATE_DEFERRED_RESUMED); } @@ -320,7 +315,6 @@ public abstract class BaseActivity extends Activity implements ActivityContext { * Sets the activity to appear as resumed. */ public void setResumed() { - if (sDebugTracing) Log.d(ACTIVITY_NOT_RESUMED_AFTER_BACK, "Activity setResumed: " + this); addActivityFlags(ACTIVITY_STATE_RESUMED | ACTIVITY_STATE_USER_ACTIVE); removeActivityFlags(ACTIVITY_STATE_USER_WILL_BE_ACTIVE); } diff --git a/tests/multivalentTests/shared/com/android/launcher3/testing/shared/TestProtocol.java b/tests/multivalentTests/shared/com/android/launcher3/testing/shared/TestProtocol.java index 8929d5d15c..1c274bf5db 100644 --- a/tests/multivalentTests/shared/com/android/launcher3/testing/shared/TestProtocol.java +++ b/tests/multivalentTests/shared/com/android/launcher3/testing/shared/TestProtocol.java @@ -171,7 +171,6 @@ public final class TestProtocol { public static final String ICON_MISSING = "b/282963545"; public static final String OVERVIEW_OVER_HOME = "b/279059025"; public static final String UIOBJECT_STALE_ELEMENT = "b/319501259"; - public static final String ACTIVITY_NOT_RESUMED_AFTER_BACK = "b/322823209"; public static final String GET_FROM_RECENTS_FAILURE = "b/321775748"; public static final String REQUEST_EMULATE_DISPLAY = "emulate-display";