From 4f6b8ec056dafd307450888064b29c915a1a1f5f Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Fri, 14 Jun 2019 17:16:17 +0000 Subject: [PATCH] Revert "RootViewImpl: Fix measure size hint for WRAP_CONTENT windows" This reverts commit c18c6da44185ce4a8b387dc367181781834cfc5f. Reason for revert: major memory increase Change-Id: Iffb9cd14343cd678849e487bfa163b5f23608ffd Test: presubmit Bug: 134695730 --- core/java/android/view/ViewRootImpl.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 80daf933123d3..e8356752f8077 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -2001,18 +2001,9 @@ public final class ViewRootImpl implements ViewParent, mDisplay.getRealSize(size); desiredWindowWidth = size.x; desiredWindowHeight = size.y; - } else if (lp.width == ViewGroup.LayoutParams.WRAP_CONTENT - || lp.height == ViewGroup.LayoutParams.WRAP_CONTENT) { - // For wrap content, we have to remeasure later on anyways. Use size consistent with - // below so we get best use of the measure cache. - desiredWindowWidth = dipToPx(config.screenWidthDp); - desiredWindowHeight = dipToPx(config.screenHeightDp); } else { - // After addToDisplay, the frame contains the frameHint from window manager, which - // for most windows is going to be the same size as the result of relayoutWindow. - // Using this here allows us to avoid remeasuring after relayoutWindow - desiredWindowWidth = frame.width(); - desiredWindowHeight = frame.height(); + desiredWindowWidth = mWinFrame.width(); + desiredWindowHeight = mWinFrame.height(); } // We used to use the following condition to choose 32 bits drawing caches: