From 2426514bf6bdd0ba7ed696439cd47fd1b1b67e60 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Mon, 14 Nov 2022 21:19:44 +0000 Subject: [PATCH] Put IDP.getDeviceProfile logging behind a feature flag - To avoid memory regression in performance testse Fix: 257359801 Test: manual Change-Id: I5ed768d90dba149eeb8f7be7d1d229b0b599a485 --- src/com/android/launcher3/InvariantDeviceProfile.java | 3 ++- src/com/android/launcher3/config/FeatureFlags.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index ca92aa48f6..3d7d14f1ab 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -17,6 +17,7 @@ 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; @@ -648,7 +649,7 @@ public class InvariantDeviceProfile { float screenHeight = config.screenHeightDp * res.getDisplayMetrics().density; int rotation = WindowManagerProxy.INSTANCE.get(context).getRotation(context); - if (Utilities.IS_DEBUG_DEVICE) { + 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); diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index d98a7f378a..f23b8623d6 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -330,6 +330,9 @@ public final class FeatureFlags { public static final BooleanFlag ENABLE_TOAST_IMPRESSION_LOGGING = getDebugFlag( "ENABLE_TOAST_IMPRESSION_LOGGING", false, "Enable toast impression logging"); + public static final BooleanFlag ENABLE_DEVICE_PROFILE_LOGGING = new DeviceFlag( + "ENABLE_DEVICE_PROFILE_LOGGING", false, "Allows DeviceProfile logging"); + public static void initialize(Context context) { synchronized (sDebugFlags) { for (DebugFlag flag : sDebugFlags) {