Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cfc7afb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not log an error about ro.sf.lcd_density on emulators" am: 6df92f08 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2300980



Change-Id: I7e0c00bc4bad24571db504e0b5db70ff9857643f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ffb12091 6df92f08

services/surfaceflinger/SurfaceFlinger.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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());

services/surfaceflinger/SurfaceFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -1375,8 +1375,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;