commit d125d0eb528fbb51a04526cbf3d50dc51759e72c
author Dominik Laskowski <domlaskowski@google.com> Fri May 08 12:36:39 2020 -0700
committer Dominik Laskowski <domlaskowski@google.com> Fri May 08 12:36:39 2020 -0700
tree 014458d7abe191a2072f02135c153f3fa9066401
parent a7e92558ee6b21be51ec2b47854639c990ec1cc2

SF: Fix emulator DPI

ag/9776294 inadvertently set DPI to density.

Bug: 155797799
Test: setprop qemu.sf.lcd_density 440
Change-Id: I5bc6333130f7c79bea892b42435de6b4e4035e96

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 87e73a0..ee978c5 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -189,7 +189,7 @@
 using ConditionalLock = ConditionalLockGuard<Mutex>;
 
 // TODO(b/141333600): Consolidate with HWC2::Display::Config::Builder::getDefaultDensity.
-constexpr float FALLBACK_DENSITY = ACONFIGURATION_DENSITY_TV / 160.f;
+constexpr float FALLBACK_DENSITY = ACONFIGURATION_DENSITY_TV;
 
 float getDensityFromProperty(const char* property, bool required) {
     char value[PROPERTY_VALUE_MAX];
@@ -198,7 +198,7 @@
         ALOGE("%s must be defined as a build property", property);
         return FALLBACK_DENSITY;
     }
-    return density / 160.f;
+    return density;
 }
 
 // Currently we only support V0_SRGB and DISPLAY_P3 as composition preference.
@@ -830,6 +830,7 @@
                 ? mInternalDisplayDensity
                 : FALLBACK_DENSITY;
     }
+    info->density /= ACONFIGURATION_DENSITY_MEDIUM;
 
     info->secure = display->isSecure();
     info->deviceProductInfo = getDeviceProductInfoLocked(*display);