diff options
| author | 2022-11-12 16:27:35 +0000 | |
|---|---|---|
| committer | 2022-11-12 16:27:35 +0000 | |
| commit | 345d32bcbf1fdeae6be3989fc96c7ea9c2ac3957 (patch) | |
| tree | 27f6bd7fa672b2551493ad1c76809de6f124ed66 /services/surfaceflinger/SurfaceFlinger.cpp | |
| parent | 7ccb22dba3001f19de7363701b9aab08b63e3e77 (diff) | |
| parent | 3388bf9c1901881d7db25f6f681b99416a88a421 (diff) | |
Merge "Do not log an error about ro.sf.lcd_density on emulators"
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index d68b00a191..f0d6aebede 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -313,8 +313,9 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory, SkipInitializationTag) mCompositionEngine(mFactory.createCompositionEngine()), mHwcServiceName(base::GetProperty("debug.sf.hwc_service_name"s, "default"s)), mTunnelModeEnabledReporter(sp<TunnelModeEnabledReporter>::make()), - 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()) { ALOGI("Using HWComposer service: %s", mHwcServiceName.c_str()); |