From 0adc36623d8f054e3b3252e00c8dbbde6f0599ca Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Mon, 4 Jul 2022 13:05:38 +0100 Subject: [PATCH] Clean up DisplayController logs - Moved debug logs under DEBUG flag which defaults to false - Moved info+ logs to permanent log tags Fix: 198965093 Test: manual Change-Id: Iea99f053da08e921542a8f532a9837997e10de5e --- .../android/launcher3/LauncherProvider.java | 2 +- .../model/GridSizeMigrationTaskV2.java | 3 +- .../launcher3/util/DisplayController.java | 31 ++++++++----------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 5aa8a46695..a20ff8c06f 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -162,7 +162,7 @@ public class LauncherProvider extends ContentProvider { private synchronized boolean prepForMigration(String dbFile, String targetTableName, Supplier src, Supplier dst) { if (TextUtils.equals(dbFile, mOpenHelper.getDatabaseName())) { - Log.e("b/198965093", "prepForMigration - target db is same as current: " + dbFile); + Log.e(TAG, "prepForMigration - target db is same as current: " + dbFile); return false; } diff --git a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java index a7b0b9d00b..c25929ac86 100644 --- a/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java +++ b/src/com/android/launcher3/model/GridSizeMigrationTaskV2.java @@ -110,9 +110,8 @@ public class GridSizeMigrationTaskV2 { private static boolean needsToMigrate( DeviceGridState srcDeviceState, DeviceGridState destDeviceState) { boolean needsToMigrate = !destDeviceState.isCompatible(srcDeviceState); - // TODO(b/198965093): Revert this change after bug is fixed if (needsToMigrate) { - Log.d("b/198965093", "Migration is needed. destDeviceState: " + destDeviceState + Log.i(TAG, "Migration is needed. destDeviceState: " + destDeviceState + ", srcDeviceState: " + srcDeviceState); } return needsToMigrate; diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java index 1a77674ddd..15fe1d9205 100644 --- a/src/com/android/launcher3/util/DisplayController.java +++ b/src/com/android/launcher3/util/DisplayController.java @@ -66,6 +66,7 @@ import java.util.Set; public class DisplayController implements ComponentCallbacks, SafeCloseable { private static final String TAG = "DisplayController"; + private static final boolean DEBUG = false; public static final MainThreadInitializedObject INSTANCE = new MainThreadInitializedObject<>(DisplayController::new); @@ -243,10 +244,9 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable { || !newInfo.mPerDisplayBounds.equals(oldInfo.mPerDisplayBounds)) { change |= CHANGE_SUPPORTED_BOUNDS; } - Log.d("b/198965093", "handleInfoChange" - + "\n\tchange: 0b" + Integer.toBinaryString(change) - + "\n\tConfiguration diff: 0x" + Integer.toHexString( - newInfo.mConfiguration.diff(oldInfo.mConfiguration))); + if (DEBUG) { + Log.d(TAG, "handleInfoChange - change: 0b" + Integer.toBinaryString(change)); + } if (change != 0) { mInfo = newInfo; @@ -286,9 +286,6 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable { private final ArrayMap mPerDisplayBounds = new ArrayMap<>(); - // TODO(b/198965093): Remove after investigation - private Configuration mConfiguration; - public Info(Context displayInfoContext) { /* don't need system overrides for external displays */ this(displayInfoContext, new WindowManagerProxy(), new ArrayMap<>()); @@ -310,21 +307,18 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable { mScreenSizeDp = new PortraitSize(config.screenHeightDp, config.screenWidthDp); navigationMode = parseNavigationMode(displayInfoContext); - // TODO(b/198965093): Remove after investigation - mConfiguration = config; - mPerDisplayBounds.putAll(perDisplayBoundsCache); WindowBounds[] cachedValue = mPerDisplayBounds.get(normalizedDisplayInfo); WindowBounds realBounds = wmProxy.getRealBounds(displayInfoContext, displayInfo); if (cachedValue == null) { // Unexpected normalizedDisplayInfo is found, recreate the cache - Log.e("b/198965093", "Unexpected normalizedDisplayInfo found, invalidating cache"); + Log.e(TAG, "Unexpected normalizedDisplayInfo found, invalidating cache"); mPerDisplayBounds.clear(); mPerDisplayBounds.putAll(wmProxy.estimateInternalDisplayBounds(displayInfoContext)); cachedValue = mPerDisplayBounds.get(normalizedDisplayInfo); if (cachedValue == null) { - Log.e("b/198965093", "normalizedDisplayInfo not found in estimation: " + Log.e(TAG, "normalizedDisplayInfo not found in estimation: " + normalizedDisplayInfo); supportedBounds.add(realBounds); } @@ -342,12 +336,13 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable { } mPerDisplayBounds.values().forEach( windowBounds -> Collections.addAll(supportedBounds, windowBounds)); - Log.e("b/198965093", "mConfiguration: " + mConfiguration); - Log.d("b/198965093", "displayInfo: " + displayInfo); - Log.d("b/198965093", "realBounds: " + realBounds); - Log.d("b/198965093", "normalizedDisplayInfo: " + normalizedDisplayInfo); - mPerDisplayBounds.forEach((key, value) -> Log.d("b/198965093", - "perDisplayBounds - " + key + ": " + Arrays.deepToString(value))); + if (DEBUG) { + Log.d(TAG, "displayInfo: " + displayInfo); + Log.d(TAG, "realBounds: " + realBounds); + Log.d(TAG, "normalizedDisplayInfo: " + normalizedDisplayInfo); + mPerDisplayBounds.forEach((key, value) -> Log.d(TAG, + "perDisplayBounds - " + key + ": " + Arrays.deepToString(value))); + } } /**