From 21d129de28ae2f543324ce320bf33eb28c1dad0e Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 12 Nov 2021 17:18:11 +0000 Subject: [PATCH] Removing logs Bug: 201305599 Test: Builds Change-Id: Ic480136ee6b158dc614d43beaed1dfce91b9ca8a --- .../com/android/launcher3/taskbar/TaskbarActivityContext.java | 3 --- .../src/com/android/launcher3/taskbar/TaskbarManager.java | 4 ---- .../src/com/android/quickstep/TouchInteractionService.java | 3 --- src/com/android/launcher3/testing/TestProtocol.java | 1 - 4 files changed, 11 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index cc83431bf4..9bf382e946 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -20,7 +20,6 @@ import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_M import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_FOLDER_OPEN; -import static com.android.launcher3.testing.TestProtocol.TASKBAR_WINDOW_CRASH; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED; import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT; @@ -204,7 +203,6 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ updateSysuiStateFlags(sharedState.sysuiStateFlags, true /* fromInit */); mWindowManager.addView(mDragLayer, mWindowLayoutParams); - Log.d(TASKBAR_WINDOW_CRASH, "Adding taskbar window"); } public boolean isThreeButtonNav() { @@ -340,7 +338,6 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ setUIController(TaskbarUIController.DEFAULT); mControllers.onDestroy(); mWindowManager.removeViewImmediate(mDragLayer); - Log.d(TASKBAR_WINDOW_CRASH, "Removing taskbar window"); } public void updateSysuiStateFlags(int systemUiStateFlags, boolean fromInit) { diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java index b2b078cb4f..57a140c454 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java @@ -18,7 +18,6 @@ package com.android.launcher3.taskbar; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; -import static com.android.launcher3.testing.TestProtocol.TASKBAR_WINDOW_CRASH; import static com.android.launcher3.util.DisplayController.CHANGE_ACTIVE_SCREEN; import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY; import static com.android.launcher3.util.DisplayController.CHANGE_SUPPORTED_BOUNDS; @@ -207,8 +206,6 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen } private void recreateTaskbar() { - Log.d(TASKBAR_WINDOW_CRASH, "Recreating taskbar: mTaskbarActivityContext=" - + mTaskbarActivityContext); destroyExistingTaskbar(); DeviceProfile dp = @@ -231,7 +228,6 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen mTaskbarActivityContext.setUIController( createTaskbarUIControllerForActivity(mActivity)); } - Log.d(TASKBAR_WINDOW_CRASH, "Finished recreating taskbar"); } public void onSystemUiFlagsChanged(int systemUiStateFlags) { diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index 377edbed5c..a0b8abdd06 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -22,7 +22,6 @@ import static android.view.MotionEvent.ACTION_UP; import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS; import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE; -import static com.android.launcher3.testing.TestProtocol.TASKBAR_WINDOW_CRASH; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.quickstep.GestureState.DEFAULT_STATE; import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS; @@ -355,7 +354,6 @@ public class TouchInteractionService extends Service @Override public void onCreate() { super.onCreate(); - Log.d(TASKBAR_WINDOW_CRASH, "TIS created"); // Initialize anything here that is needed in direct boot mode. // Everything else should be initialized in onUserUnlocked() below. mMainChoreographer = Choreographer.getInstance(); @@ -517,7 +515,6 @@ public class TouchInteractionService extends Service @Override public void onDestroy() { Log.d(TAG, "Touch service destroyed: user=" + getUserId()); - Log.d(TASKBAR_WINDOW_CRASH, "TIS destroyed"); sIsInitialized = false; if (mDeviceState.isUserUnlocked()) { mInputConsumer.unregisterInputConsumer(); diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java index 9a74fb1577..7b7784fbcb 100644 --- a/src/com/android/launcher3/testing/TestProtocol.java +++ b/src/com/android/launcher3/testing/TestProtocol.java @@ -122,7 +122,6 @@ public final class TestProtocol { public static final String REQUEST_MOCK_SENSOR_ROTATION = "mock-sensor-rotation"; public static final String PERMANENT_DIAG_TAG = "TaplTarget"; - public static final String TASKBAR_WINDOW_CRASH = "b/201305599"; public static final String TASK_VIEW_ID_CRASH = "b/195430732"; public static final String NO_DROP_TARGET = "b/195031154"; public static final String NULL_INT_SET = "b/200572078";