From fe4ef545e9d46ca2ffe43410da5fe9c950ebaa6c Mon Sep 17 00:00:00 2001
From: Marin Shalamanov <shalamanov@google.com>
Date: Thu, 18 Jun 2020 20:32:57 +0200
Subject: [PATCH] Don't change density when forcing screen size

Test: m services
Bug: 159333536
Bug: 156100799
Change-Id: Ib4038f506cdddc88bc86cebbd1fa7992480e66bd
---
 services/core/java/com/android/server/wm/DisplayContent.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index b0947cfb43e3b..3670c1199e19c 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -2485,7 +2485,7 @@ class DisplayContent extends DisplayArea.Root implements WindowManagerPolicy.Dis
         }
 
         Slog.i(TAG_WM, "Using new display size: " + width + "x" + height);
-        updateBaseDisplayMetrics(width, height, width * mBaseDisplayDensity / mBaseDisplayWidth);
+        updateBaseDisplayMetrics(width, height, mBaseDisplayDensity);
         reconfigureDisplayLocked();
 
         if (!mIsSizeForced) {