commit a5156f6bcddf0d74324e3f04d2bb2d5086ce3f70
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Sep 05 10:55:17 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 05 10:55:17 2024 +0000
tree e08ae96261c3fd5fe870ae0312c175e73b7a7dcf
parent bbcc65e0ef884bf3ad3937a248a29434436d8b15
parent 7ab6892c5b9723e7df2057edb6f17c117b8aa1b5

Merge "Update display metrics with initial density if it is not forced" into main

services/core/java/com/android/server/wm/DisplayContent.java

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 97d35b9..e8a3951 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -3225,7 +3225,8 @@
         }
 
         Slog.i(TAG_WM, "Using new display size: " + width + "x" + height);
-        updateBaseDisplayMetrics(width, height, mBaseDisplayDensity,
+        updateBaseDisplayMetrics(width, height,
+                mIsDensityForced ? mBaseDisplayDensity : mInitialDisplayDensity,
                 xDPI != INVALID_DPI ? xDPI : mBaseDisplayPhysicalXDpi,
                 yDPI != INVALID_DPI ? yDPI : mBaseDisplayPhysicalYDpi);
         reconfigureDisplayLocked();