commit d1e8de976601995a3ffdf45c846b4f6b7cf71b2d
author Roman Kiryanov <rkir@google.com> Fri Nov 11 15:35:16 2022 -0800
committer Roman Kiryanov <rkir@google.com> Sat Nov 12 16:28:22 2022 +0000
tree 0734fe0aaac1dd536d4c3f23ae2485f55a4777f0
parent bb7e77ba945d566f185c7aef3f00f043a65288ac

Do not log an error about ro.sf.lcd_density on emulators

The code already has all support, but still
logs an error.

Bug: 258856313
Test: boot emulator, check logcat
Change-Id: I69630586ca234db21ea1fbe0d70bbe21155f0b4d
Merged-In: I69630586ca234db21ea1fbe0d70bbe21155f0b4d
Signed-off-by: Roman Kiryanov <rkir@google.com>

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index e234ed0..2fa40a5 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -328,8 +328,9 @@
         mCompositionEngine(mFactory.createCompositionEngine()),
         mHwcServiceName(base::GetProperty("debug.sf.hwc_service_name"s, "default"s)),
         mTunnelModeEnabledReporter(new TunnelModeEnabledReporter()),
-        mInternalDisplayDensity(getDensityFromProperty("ro.sf.lcd_density", true)),
         mEmulatedDisplayDensity(getDensityFromProperty("qemu.sf.lcd_density", false)),
+        mInternalDisplayDensity(
+                getDensityFromProperty("ro.sf.lcd_density", !mEmulatedDisplayDensity)),
         mPowerAdvisor(std::make_unique<Hwc2::impl::PowerAdvisor>(*this)),
         mWindowInfosListenerInvoker(sp<WindowInfosListenerInvoker>::make(*this)) {
     ALOGI("Using HWComposer service: %s", mHwcServiceName.c_str());