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

Commit d209221a authored by Marin Shalamanov's avatar Marin Shalamanov Committed by Android (Google) Code Review
Browse files

Merge "Remove dead code around use_frame_rate_api"

parents e10d2a3a 82de19bc

services/surfaceflinger/Layer.cpp

+0 −3
Original line number Original line Diff line number Diff line
@@ -1166,9 +1166,6 @@ void Layer::updateTreeHasFrameRateVote() { 
}

}





bool Layer::setFrameRate(FrameRate frameRate) {

bool Layer::setFrameRate(FrameRate frameRate) {

    if (!mFlinger->useFrameRateApi) {

        return false;

    }

    if (mDrawingState.frameRate == frameRate) {

    if (mDrawingState.frameRate == frameRate) {

        return false;

        return false;

    }

    }

services/surfaceflinger/SurfaceFlinger.cpp

+0 −3
Original line number Original line Diff line number Diff line
@@ -331,7 +331,6 @@ Dataspace SurfaceFlinger::defaultCompositionDataspace = Dataspace::V0_SRGB; 
ui::PixelFormat SurfaceFlinger::defaultCompositionPixelFormat = ui::PixelFormat::RGBA_8888;

ui::PixelFormat SurfaceFlinger::defaultCompositionPixelFormat = ui::PixelFormat::RGBA_8888;

Dataspace SurfaceFlinger::wideColorGamutCompositionDataspace = Dataspace::V0_SRGB;

Dataspace SurfaceFlinger::wideColorGamutCompositionDataspace = Dataspace::V0_SRGB;

ui::PixelFormat SurfaceFlinger::wideColorGamutCompositionPixelFormat = ui::PixelFormat::RGBA_8888;

ui::PixelFormat SurfaceFlinger::wideColorGamutCompositionPixelFormat = ui::PixelFormat::RGBA_8888;

bool SurfaceFlinger::useFrameRateApi;

bool SurfaceFlinger::enableSdrDimming;

bool SurfaceFlinger::enableSdrDimming;

LatchUnsignaledConfig SurfaceFlinger::enableLatchUnsignaledConfig;

LatchUnsignaledConfig SurfaceFlinger::enableLatchUnsignaledConfig;
@@ -486,8 +485,6 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory) : SurfaceFlinger(factory, SkipI 
        android::hardware::details::setTrebleTestingOverride(true);

        android::hardware::details::setTrebleTestingOverride(true);

    }

    }





    useFrameRateApi = use_frame_rate_api(true);



    mRefreshRateOverlaySpinner = property_get_bool("sf.debug.show_refresh_rate_overlay_spinner", 0);

    mRefreshRateOverlaySpinner = property_get_bool("sf.debug.show_refresh_rate_overlay_spinner", 0);





    // Debug property overrides ro. property

    // Debug property overrides ro. property

services/surfaceflinger/SurfaceFlinger.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -248,11 +248,6 @@ public: 
    static ui::Dataspace wideColorGamutCompositionDataspace;

    static ui::Dataspace wideColorGamutCompositionDataspace;

    static ui::PixelFormat wideColorGamutCompositionPixelFormat;

    static ui::PixelFormat wideColorGamutCompositionPixelFormat;





    // Whether to use frame rate API when deciding about the refresh rate of the display. This

    // variable is caches in SF, so that we can check it with each layer creation, and a void the

    // overhead that is caused by reading from sysprop.

    static bool useFrameRateApi;



    static constexpr SkipInitializationTag SkipInitialization;

    static constexpr SkipInitializationTag SkipInitialization;





    // Whether or not SDR layers should be dimmed to the desired SDR white point instead of

    // Whether or not SDR layers should be dimmed to the desired SDR white point instead of

services/surfaceflinger/SurfaceFlingerProperties.cpp

+0 −8
Original line number Original line Diff line number Diff line
@@ -304,14 +304,6 @@ bool support_kernel_idle_timer(bool defaultValue) { 
    return defaultValue;

    return defaultValue;

}

}





bool use_frame_rate_api(bool defaultValue) {

    auto temp = SurfaceFlingerProperties::use_frame_rate_api();

    if (temp.has_value()) {

        return *temp;

    }

    return defaultValue;

}



bool enable_sdr_dimming(bool defaultValue) {

bool enable_sdr_dimming(bool defaultValue) {

    return SurfaceFlingerProperties::enable_sdr_dimming().value_or(defaultValue);

    return SurfaceFlingerProperties::enable_sdr_dimming().value_or(defaultValue);

}

}

services/surfaceflinger/SurfaceFlingerProperties.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -88,8 +88,6 @@ bool enable_protected_contents(bool defaultValue); 




bool support_kernel_idle_timer(bool defaultValue);

bool support_kernel_idle_timer(bool defaultValue);





bool use_frame_rate_api(bool defaultValue);



int32_t display_update_imminent_timeout_ms(int32_t defaultValue);

int32_t display_update_imminent_timeout_ms(int32_t defaultValue);





android::ui::DisplayPrimaries getDisplayNativePrimaries();

android::ui::DisplayPrimaries getDisplayNativePrimaries();