summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author joehsu <joehsu@google.com> 2024-09-05 16:29:43 +0800
committer joehsu <joehsu@google.com> 2024-09-05 17:06:22 +0800
commit7ab6892c5b9723e7df2057edb6f17c117b8aa1b5 (patch)
treeb1a6be6b62eeff869471edac6147f2f9ef46bc70
parent431935398d079f07ba343be4ecd3ecf4c4b438f6 (diff)
Update display metrics with initial density if it is not forced
When updating display metrics, density could be modified according to the ratio of max UI width and input width. We should use the initial display density if it is not a forced value. Bug: 274111844 Flag: EXEMPT bugfix Test: atest DisplayWindowSettingsTests#testSetForcedSize Change-Id: I7af3e4011dc2e80d75213d4027aceaf01209fbe1
-rw-r--r--services/core/java/com/android/server/wm/DisplayContent.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 97d35b90ef3c..e8a3951a93d4 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 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
}
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();