commit ae3611d28a9599490a44423a8872685d6d0db127
author Lucas Berthou <berlu@google.com> Wed Oct 16 19:58:52 2024 +0000
committer Lucas Berthou <berlu@google.com> Wed Oct 16 20:00:49 2024 +0000
tree 33a2b5d475d8784322d585cdb7f366f966790ad3
parent 6c38f23457c35326695828c6872176bd75a88612

SF: fixing typo

This is in theory a no-op change since the chances of dpiX == -1 && dpiY
!= -1 are virtually null. But for correctedness might be good to clean
up.

Flag: com.android.graphics.surfaceflinger.flags.correct_dpi_with_display_size
Bug: 361413340
Test: HWComposerTest
Change-Id: I967edcf86f92b94db7b861129ab788567c133618

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index d08e261..05ba967 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -379,7 +379,7 @@
         const int32_t dpiX = getAttribute(hwcDisplayId, configId, hal::Attribute::DPI_X);
         const int32_t dpiY = getAttribute(hwcDisplayId, configId, hal::Attribute::DPI_Y);
         const DisplayConfiguration::Dpi hwcDpi =
-                DisplayConfiguration::Dpi{dpiX == -1 ? dpiY : dpiX / 1000.f,
+                DisplayConfiguration::Dpi{dpiX == -1 ? dpiX : dpiX / 1000.f,
                                           dpiY == -1 ? dpiY : dpiY / 1000.f};
         const DisplayConfiguration::Dpi estimatedDPI =
                 getEstimatedDotsPerInchFromSize(hwcDisplayId, hwcMode);