From d1e8de976601995a3ffdf45c846b4f6b7cf71b2d Mon Sep 17 00:00:00 2001
From: Roman Kiryanov <rkir@google.com>
Date: Fri, 11 Nov 2022 15:35:16 -0800
Subject: 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 | 3 ++-
 services/surfaceflinger/SurfaceFlinger.h   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index e234ed0ed4..2fa40a5438 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -328,8 +328,9 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory, SkipInitializationTag)
         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());
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 46f0e6ba83..d91aa118e9 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -1374,8 +1374,8 @@ private:
     sp<TunnelModeEnabledReporter> mTunnelModeEnabledReporter;
     ui::DisplayPrimaries mInternalDisplayPrimaries;
 
-    const float mInternalDisplayDensity;
     const float mEmulatedDisplayDensity;
+    const float mInternalDisplayDensity;
 
     // Should only be accessed by the main thread.
     sp<os::IInputFlinger> mInputFlinger;
-- 
cgit v1.2.3-59-g8ed1b