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

Commit 4fabc011 authored by Lucas Berthou's avatar Lucas Berthou
Browse files

SF: cleaning up hotplug2 flag 

This flag has reached nextfood a long time ago and is therefore no
longer needed.

Bug: 374185760
Flag: EXEMPT flag removal
Test: manual
Change-Id: I6d21b4381bbadcfb4661cdbc9b665727fa2d3c90
parent 6501473c

services/surfaceflinger/SurfaceFlinger.cpp

+6 −10
Original line number Diff line number Diff line
@@ -2248,13 +2248,11 @@ void SurfaceFlinger::onComposerHalHotplugEvent(hal::HWDisplayId hwcDisplayId, 
        return;

    }



    if (FlagManager::getInstance().hotplug2()) {

    // TODO(b/311403559): use enum type instead of int

    const auto errorCode = static_cast<int32_t>(event);

    ALOGD("%s: Hotplug error %d for hwcDisplayId %" PRIu64, __func__, errorCode, hwcDisplayId);

    mScheduler->dispatchHotplugError(errorCode);

}

}



void SurfaceFlinger::onComposerHalVsyncPeriodTimingChanged(

        hal::HWDisplayId, const hal::VsyncPeriodChangeTimeline& timeline) {
@@ -3483,10 +3481,8 @@ bool SurfaceFlinger::configureLocked() { 
                        processHotplugConnect(displayId, hwcDisplayId, std::move(*info),

                                              displayString.c_str());

                if (!activeModeIdOpt) {

                    if (FlagManager::getInstance().hotplug2()) {

                    mScheduler->dispatchHotplugError(

                            static_cast<int32_t>(DisplayHotplugEvent::ERROR_UNKNOWN));

                    }

                    getHwComposer().disconnectDisplay(displayId);

                    continue;

                }

services/surfaceflinger/common/FlagManager.cpp

+0 −2
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ void FlagManager::dump(std::string& result) const { 
    DUMP_READ_ONLY_FLAG(frame_rate_category_mrr);

    DUMP_READ_ONLY_FLAG(misc1);

    DUMP_READ_ONLY_FLAG(vrr_config);

    DUMP_READ_ONLY_FLAG(hotplug2);

    DUMP_READ_ONLY_FLAG(hdcp_level_hal);

    DUMP_READ_ONLY_FLAG(multithreaded_present);

    DUMP_READ_ONLY_FLAG(add_sf_skipped_frames_to_trace);
@@ -233,7 +232,6 @@ FLAG_MANAGER_READ_ONLY_FLAG(stable_edid_ids, "debug.sf.stable_edid_ids") 
FLAG_MANAGER_READ_ONLY_FLAG(frame_rate_category_mrr, "debug.sf.frame_rate_category_mrr")

FLAG_MANAGER_READ_ONLY_FLAG(misc1, "")

FLAG_MANAGER_READ_ONLY_FLAG(vrr_config, "debug.sf.enable_vrr_config")

FLAG_MANAGER_READ_ONLY_FLAG(hotplug2, "")

FLAG_MANAGER_READ_ONLY_FLAG(hdcp_level_hal, "")

FLAG_MANAGER_READ_ONLY_FLAG(multithreaded_present, "debug.sf.multithreaded_present")

FLAG_MANAGER_READ_ONLY_FLAG(add_sf_skipped_frames_to_trace, "")

services/surfaceflinger/common/include/common/FlagManager.h

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ public: 
    bool stable_edid_ids() const;

    bool misc1() const;

    bool vrr_config() const;

    bool hotplug2() const;

    bool hdcp_level_hal() const;

    bool multithreaded_present() const;

    bool add_sf_skipped_frames_to_trace() const;