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

Commit 33387f2e authored by Melody Hsu's avatar Melody Hsu Committed by Android (Google) Code Review
Browse files

Merge "Flag removal: reject_dupe_layerstacks" into main

parents 5833669d c7cebba4

services/surfaceflinger/SurfaceFlinger.cpp

+5 −10
Original line number Diff line number Diff line
@@ -2888,17 +2888,12 @@ CompositeResultsPerDisplay SurfaceFlinger::composite( 
    // Tracks layer stacks of displays that are added to CompositionEngine output.

    ui::DisplayMap<ui::LayerStack, ftl::Unit> outputLayerStacks;

    auto isUniqueOutputLayerStack = [&outputLayerStacks](DisplayId id, ui::LayerStack layerStack) {

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

            if (layerStack != ui::UNASSIGNED_LAYER_STACK &&

                outputLayerStacks.contains(layerStack)) {

                // TODO: remove log and DisplayId from params once reject_dupe_layerstacks flag is

                // removed

        if (layerStack != ui::UNASSIGNED_LAYER_STACK && outputLayerStacks.contains(layerStack)) {

            ALOGD("Existing layer stack ID %d output to another display %" PRIu64

                  ", dropping display from outputs",

                  layerStack.id, id.value);

            return false;

        }

        }



        outputLayerStacks.try_emplace(layerStack);

        return true;

services/surfaceflinger/common/FlagManager.cpp

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

    DUMP_ACONFIG_FLAG(pacesetter_selection);

    DUMP_ACONFIG_FLAG(protected_if_client);

    DUMP_ACONFIG_FLAG(reject_dupe_layerstacks);

    DUMP_ACONFIG_FLAG(renderable_buffer_usage);

    DUMP_ACONFIG_FLAG(restore_blur_step);

    DUMP_ACONFIG_FLAG(skip_invisible_windows_in_input);
@@ -295,7 +294,6 @@ FLAG_MANAGER_ACONFIG_FLAG(skip_invisible_windows_in_input, ""); 
FLAG_MANAGER_ACONFIG_FLAG(stop_layer, "");

FLAG_MANAGER_ACONFIG_FLAG(begone_bright_hlg, "debug.sf.begone_bright_hlg");

FLAG_MANAGER_ACONFIG_FLAG(window_blur_kawase2, "");

FLAG_MANAGER_ACONFIG_FLAG(reject_dupe_layerstacks, "");

FLAG_MANAGER_ACONFIG_FLAG(synced_resolution_switch, "");



/// Trunk stable server (R/W) flags ///

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

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

    bool pacesetter_selection() const;

    bool protected_if_client() const;

    bool reject_dupe_layerstacks() const;

    bool renderable_buffer_usage() const;

    bool restore_blur_step() const;

    bool skip_invisible_windows_in_input() const;

services/surfaceflinger/surfaceflinger_flags_new.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -247,17 +247,6 @@ flag { 
  bug: "374072507"

} # pacesetter_selection



flag {

  name: "reject_dupe_layerstacks"

  namespace: "window_surfaces"

  description: "Reject duplicate layerstacks for displays"

  bug: "370358572"

  is_fixed_read_only: true

  metadata {

    purpose: PURPOSE_BUGFIX

  }

 } # reject_dupe_layerstacks



flag {

  name: "skip_invisible_windows_in_input"

  namespace: "window_surfaces"

services/surfaceflinger/tests/MultiDisplay_test.cpp

+0 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"



#include <common/FlagManager.h>

#include <gui/IConsumerListener.h>

#include <ui/DisplayState.h>
@@ -158,8 +157,6 @@ TEST_F(MultiDisplayTest, RenderLayerInMirroredVirtualDisplay) { 


#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

TEST_F(MultiDisplayTest, rejectDuplicateLayerStacks) {

    if (!FlagManager::getInstance().reject_dupe_layerstacks()) return;



    // Setup

    sp<CpuConsumer> cpuConsumer1 = sp<CpuConsumer>::make(static_cast<size_t>(1));

    cpuConsumer1->setName(String8("consumer 1"));