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

Commit 25f3b708 authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cleanup_frame_rate_override_sysprop" 

* changes:
  SF: minor cosmetic fix
  SF: cleanup frame rate override sysprops
parents d9e32439 0d4b41c0

services/surfaceflinger/SurfaceFlinger.cpp

+5 −18
Original line number Diff line number Diff line
@@ -3144,24 +3144,11 @@ sp<DisplayDevice> SurfaceFlinger::setupNewDisplayDeviceInternal( 
        const auto [kernelIdleTimerController, idleTimerTimeoutMs] =

                getKernelIdleTimerProperties(compositionDisplay->getId());



        const auto enableFrameRateOverride = [&] {

        using Config = scheduler::RefreshRateSelector::Config;

            if (!sysprop::enable_frame_rate_override(true)) {

                return Config::FrameRateOverride::Disabled;

            }



            if (sysprop::frame_rate_override_for_native_rates(false)) {

                return Config::FrameRateOverride::AppOverrideNativeRefreshRates;

            }



            if (!sysprop::frame_rate_override_global(true)) {

                return Config::FrameRateOverride::AppOverride;

            }



            return Config::FrameRateOverride::Enabled;

        }();



        scheduler::RefreshRateSelector::Config config =

        const auto enableFrameRateOverride = sysprop::enable_frame_rate_override(true)

                ? Config::FrameRateOverride::Enabled

                : Config::FrameRateOverride::Disabled;

        Config config =

                {.enableFrameRateOverride = enableFrameRateOverride,

                 .frameRateMultipleThreshold =

                         base::GetIntProperty("debug.sf.frame_rate_multiple_threshold", 0),

services/surfaceflinger/SurfaceFlingerProperties.cpp

+0 −8
Original line number Diff line number Diff line
@@ -367,14 +367,6 @@ bool enable_frame_rate_override(bool defaultValue) { 
    return SurfaceFlingerProperties::enable_frame_rate_override().value_or(defaultValue);

}



bool frame_rate_override_for_native_rates(bool defaultValue) {

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

}



bool frame_rate_override_global(bool defaultValue) {

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

}



bool enable_layer_caching(bool defaultValue) {

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

}

services/surfaceflinger/SurfaceFlingerProperties.h

+0 −4
Original line number Diff line number Diff line
@@ -96,10 +96,6 @@ bool update_device_product_info_on_hotplug_reconnect(bool defaultValue); 


bool enable_frame_rate_override(bool defaultValue);



bool frame_rate_override_for_native_rates(bool defaultValue);



bool frame_rate_override_global(bool defaultValue);



bool enable_layer_caching(bool defaultValue);



bool enable_sdr_dimming(bool defaultValue);

services/surfaceflinger/sysprop/SurfaceFlingerProperties.sysprop

+0 −22
Original line number Diff line number Diff line
@@ -445,28 +445,6 @@ prop { 
    prop_name: "ro.surface_flinger.enable_frame_rate_override"

}



# Limits the frame rate override feature (enable_frame_rate_override) to override the refresh rate

# to native display refresh rates only. Before introducing this flag, native display refresh rates

# was the default behaviour. With this flag we can control which behaviour we want explicitly.

# This flag is introduced as a fail-safe mechanism and planned to be defaulted to false.

prop {

    api_name: "frame_rate_override_for_native_rates"

    type: Boolean

    scope: Public

    access: Readonly

    prop_name: "ro.surface_flinger.frame_rate_override_for_native_rates"

}



# Enables the frame rate override feature (enable_frame_rate_override) to

# override the frame rate globally instead of only for individual apps.

prop {

    api_name: "frame_rate_override_global"

    type: Boolean

    scope: Public

    access: Readonly

    prop_name: "ro.surface_flinger.frame_rate_override_global"

}



# Enables Layer Caching

prop {

    api_name: "enable_layer_caching"

services/surfaceflinger/sysprop/api/SurfaceFlingerProperties-current.txt

+0 −8
Original line number Diff line number Diff line
@@ -60,14 +60,6 @@ props { 
    api_name: "force_hwc_copy_for_virtual_displays"

    prop_name: "ro.surface_flinger.force_hwc_copy_for_virtual_displays"

  }

  prop {

    api_name: "frame_rate_override_for_native_rates"

    prop_name: "ro.surface_flinger.frame_rate_override_for_native_rates"

  }

  prop {

    api_name: "frame_rate_override_global"

    prop_name: "ro.surface_flinger.frame_rate_override_global"

  }

  prop {

    api_name: "has_HDR_display"

    prop_name: "ro.surface_flinger.has_HDR_display"