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

Commit 345d32bc authored by Roman Kiryanov's avatar Roman Kiryanov Committed by Android (Google) Code Review
Browse files

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

parents 7ccb22db 3388bf9c

services/surfaceflinger/SurfaceFlinger.cpp

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

services/surfaceflinger/SurfaceFlinger.h

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