From eabf2c39f70404f788a3b7eef487aaa791346413 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Wed, 22 Feb 2023 20:27:49 +0000 Subject: [PATCH] Revert "Reland "Add logs for InvariantDeviceProfile.getDeviceProfile"" This reverts commit 5dfd939d418db13e424aba0fdee4577a7da648b8. Reason for revert: b/270395565 Bug: 253338238 Change-Id: I6b2e44c92a67f6675d6947f34167a5f0c1cc6a45 --- .../android/launcher3/InvariantDeviceProfile.java | 15 --------------- .../android/launcher3/config/FeatureFlags.java | 3 --- 2 files changed, 18 deletions(-) diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index 604c1b87e6..12b4c27f73 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -17,7 +17,6 @@ package com.android.launcher3; import static com.android.launcher3.Utilities.dpiFromPx; -import static com.android.launcher3.config.FeatureFlags.ENABLE_DEVICE_PROFILE_LOGGING; import static com.android.launcher3.config.FeatureFlags.ENABLE_TWO_PANEL_HOME; import static com.android.launcher3.testing.shared.ResourceUtils.INVALID_RESOURCE_HANDLE; import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY; @@ -69,8 +68,6 @@ import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; @@ -683,18 +680,6 @@ public class InvariantDeviceProfile { float screenHeight = config.screenHeightDp * res.getDisplayMetrics().density; int rotation = WindowManagerProxy.INSTANCE.get(context).getRotation(context); - if (Utilities.IS_DEBUG_DEVICE && ENABLE_DEVICE_PROFILE_LOGGING.get()) { - StringWriter stringWriter = new StringWriter(); - PrintWriter printWriter = new PrintWriter(stringWriter); - DisplayController.INSTANCE.get(context).dump(printWriter); - printWriter.flush(); - Log.d("b/253338238", "getDeviceProfile -" - + "\nconfig: " + config - + "\ndisplayMetrics: " + res.getDisplayMetrics() - + "\nrotation: " + rotation - + "\n" + stringWriter, - new Exception()); - } return getBestMatch(screenWidth, screenHeight, rotation); } diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 0ec036cd67..8d87f3eba9 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -369,9 +369,6 @@ public final class FeatureFlags { "ENABLE_NEW_GESTURE_NAV_TUTORIAL", false, "Enable the redesigned gesture navigation tutorial"); - public static final BooleanFlag ENABLE_DEVICE_PROFILE_LOGGING = new DeviceFlag( - "ENABLE_DEVICE_PROFILE_LOGGING", false, "Allows DeviceProfile logging"); - public static final BooleanFlag ENABLE_LAUNCH_FROM_STAGED_APP = getDebugFlag( "ENABLE_LAUNCH_FROM_STAGED_APP", true, "Enable the ability to tap a staged app during split select to launch it in full screen"