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

Commit 0c7d73d4 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11520864 from d129f182 to 24Q2-release 

Change-Id: I7f24c10faf03f6b4aea99dbd6a8afdb4ad47940f
parents 8de2fd83 d129f182

services/surfaceflinger/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -12,7 +12,10 @@ aconfig_declarations { 
    name: "surfaceflinger_flags",

    package: "com.android.graphics.surfaceflinger.flags",

    container: "system",

    srcs: ["surfaceflinger_flags.aconfig"],

    srcs: [

        "surfaceflinger_flags.aconfig",

        "surfaceflinger_flags_new.aconfig",

    ],

}



cc_aconfig_library {

services/surfaceflinger/Scheduler/RefreshRateSelector.cpp

+32 −6
Original line number Diff line number Diff line
@@ -948,17 +948,43 @@ auto RefreshRateSelector::getFrameRateOverrides(const std::vector<LayerRequireme 
    const auto layersByUid = groupLayersByUid(layers);

    UidToFrameRateOverride frameRateOverrides;

    for (const auto& [uid, layersWithSameUid] : layersByUid) {

        // Layers with ExplicitExactOrMultiple expect touch boost

        const bool hasExplicitExactOrMultiple =

                std::any_of(layersWithSameUid.cbegin(), layersWithSameUid.cend(),

                            [](const auto& layer) {

                                return layer->vote == LayerVoteType::ExplicitExactOrMultiple;

                            });

        // Look for cases that should not have frame rate overrides.

        bool hasExplicitExactOrMultiple = false;

        bool hasExplicitDefault = false;

        bool hasHighHint = false;

        for (const auto& layer : layersWithSameUid) {

            switch (layer->vote) {

                case LayerVoteType::ExplicitExactOrMultiple:

                    hasExplicitExactOrMultiple = true;

                    break;

                case LayerVoteType::ExplicitDefault:

                    hasExplicitDefault = true;

                    break;

                case LayerVoteType::ExplicitCategory:

                    if (layer->frameRateCategory == FrameRateCategory::HighHint) {

                        hasHighHint = true;

                    }

                    break;

                default:

                    // No action

                    break;

            }

            if (hasExplicitExactOrMultiple && hasExplicitDefault && hasHighHint) {

                break;

            }

        }



        // Layers with ExplicitExactOrMultiple expect touch boost

        if (globalSignals.touch && hasExplicitExactOrMultiple) {

            continue;

        }



        // Mirrors getRankedFrameRates. If there is no ExplicitDefault, expect touch boost and

        // skip frame rate override.

        if (hasHighHint && !hasExplicitDefault) {

            continue;

        }



        for (auto& [_, score] : scoredFrameRates) {

            score = 0;

        }

services/surfaceflinger/surfaceflinger_flags.aconfig

+18 −0
Original line number Diff line number Diff line 
# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig



package: "com.android.graphics.surfaceflinger.flags"

container: "system"
@@ -25,6 +27,8 @@ flag { 
  is_fixed_read_only: true

}



# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig



flag {

  name: "enable_layer_command_batching"

  namespace: "core_graphics"
@@ -49,6 +53,8 @@ flag { 
  is_fixed_read_only: true

}



# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig



flag {

  name: "hotplug2"

  namespace: "core_graphics"
@@ -73,6 +79,8 @@ flag { 
  is_fixed_read_only: true

}



# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig



flag {

  name: "refresh_rate_overlay_on_external_display"

  namespace: "core_graphics"
@@ -98,6 +106,8 @@ flag { 
#   is_fixed_read_only: true

# }



# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig



flag {

  name: "cache_when_source_crop_layer_only_moved"

  namespace: "core_graphics"
@@ -130,6 +140,8 @@ flag { 
  is_fixed_read_only: true

}



# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig



flag {

  name: "game_default_frame_rate"

  namespace: "game"
@@ -162,6 +174,8 @@ flag { 
  is_fixed_read_only: true

}



# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig



flag {

  name: "renderable_buffer_usage"

  namespace: "core_graphics"
@@ -184,6 +198,8 @@ flag { 
  }

}



# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig



flag {

  name: "dont_skip_on_early_ro"

  namespace: "core_graphics"
@@ -205,3 +221,5 @@ flag { 
    purpose: PURPOSE_BUGFIX

  }

}



# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig

services/surfaceflinger/surfaceflinger_flags_new.aconfig

0 → 100644
+13 −0
Original line number Diff line number Diff line 
# IMPORTANT - please keep alphabetize to reduce merge conflicts



package: "com.android.graphics.surfaceflinger.flags"

container: "system"



flag {

  name: "dont_skip_on_early_ro2"

  namespace: "core_graphics"

  description: "This flag is guarding the behaviour where SurfaceFlinger is trying to opportunistically present a frame when the configuration change from late to early"

  bug: "273702768"

} # dont_skip_on_early_ro2



# IMPORTANT - please keep alphabetize to reduce merge conflicts

services/surfaceflinger/tests/unittests/RefreshRateSelectorTest.cpp

+215 −0
Original line number Diff line number Diff line
@@ -3159,6 +3159,210 @@ TEST_P(RefreshRateSelectorTest, getFrameRateOverrides_twoUids) { 
    EXPECT_TRUE(frameRateOverrides.empty());

}



TEST_P(RefreshRateSelectorTest, getFrameRateOverrides_withFrameRateCategory) {

    if (GetParam() == Config::FrameRateOverride::Disabled) {

        return;

    }



    ASSERT_TRUE(GetParam() == Config::FrameRateOverride::AppOverrideNativeRefreshRates ||

                GetParam() == Config::FrameRateOverride::AppOverride ||

                GetParam() == Config::FrameRateOverride::Enabled);



    auto selector = createSelector(kModes_30_60_72_90_120, kModeId120);



    std::vector<LayerRequirement> layers = {{.ownerUid = 1234, .weight = 1.f},

                                            {.ownerUid = 1234, .weight = 1.f}};



    // HighHint case with touch boost and thus should skip frame rate override.

    layers[0].name = "ExplicitCategory HighHint";

    layers[0].vote = LayerVoteType::ExplicitCategory;

    layers[0].desiredRefreshRate = 0_Hz;

    layers[0].frameRateCategory = FrameRateCategory::HighHint;

    layers[1].name = "ExplicitCategory High";

    layers[1].vote = LayerVoteType::ExplicitCategory;

    layers[1].desiredRefreshRate = 0_Hz;

    layers[1].frameRateCategory = FrameRateCategory::High;

    auto frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {});

    EXPECT_TRUE(frameRateOverrides.empty());

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {.touch = true});

    EXPECT_TRUE(frameRateOverrides.empty());



    // HighHint case with touch boost and thus should skip frame rate override.

    layers[0].name = "ExplicitCategory HighHint";

    layers[0].vote = LayerVoteType::ExplicitCategory;

    layers[0].desiredRefreshRate = 0_Hz;

    layers[0].frameRateCategory = FrameRateCategory::HighHint;

    layers[1].name = "ExplicitCategory Normal";

    layers[1].vote = LayerVoteType::ExplicitCategory;

    layers[1].desiredRefreshRate = 0_Hz;

    layers[1].frameRateCategory = FrameRateCategory::Normal;

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {});

    EXPECT_TRUE(frameRateOverrides.empty());

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {.touch = true});

    EXPECT_TRUE(frameRateOverrides.empty());



    // HighHint case with touch boost and thus should skip frame rate override.

    layers[0].name = "ExplicitCategory HighHint";

    layers[0].vote = LayerVoteType::ExplicitCategory;

    layers[0].desiredRefreshRate = 0_Hz;

    layers[0].frameRateCategory = FrameRateCategory::HighHint;

    layers[1].name = "ExplicitCategory Low";

    layers[1].vote = LayerVoteType::ExplicitCategory;

    layers[1].desiredRefreshRate = 0_Hz;

    layers[1].frameRateCategory = FrameRateCategory::Low;

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {});

    EXPECT_TRUE(frameRateOverrides.empty());

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {.touch = true});

    EXPECT_TRUE(frameRateOverrides.empty());



    // HighHint case with touch boost and thus should skip frame rate override.

    layers[0].name = "ExplicitCategory HighHint";

    layers[0].vote = LayerVoteType::ExplicitCategory;

    layers[0].desiredRefreshRate = 0_Hz;

    layers[0].frameRateCategory = FrameRateCategory::HighHint;

    layers[1].name = "ExplicitCategory NoPreference";

    layers[1].vote = LayerVoteType::ExplicitCategory;

    layers[1].desiredRefreshRate = 0_Hz;

    layers[1].frameRateCategory = FrameRateCategory::NoPreference;

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {});

    EXPECT_TRUE(frameRateOverrides.empty());

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {.touch = true});

    EXPECT_TRUE(frameRateOverrides.empty());



    // HighHint case *without* touch boost has frame rate override.

    // For example, game and touch interaction.

    layers[0].name = "ExplicitCategory HighHint";

    layers[0].vote = LayerVoteType::ExplicitCategory;

    layers[0].desiredRefreshRate = 0_Hz;

    layers[0].frameRateCategory = FrameRateCategory::HighHint;

    layers[1].name = "ExplicitDefault 60";

    layers[1].vote = LayerVoteType::ExplicitDefault;

    layers[1].desiredRefreshRate = 60_Hz;

    layers[1].frameRateCategory = FrameRateCategory::Default;

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {});

    EXPECT_EQ(1u, frameRateOverrides.size());

    ASSERT_EQ(1u, frameRateOverrides.count(1234));

    EXPECT_EQ(60_Hz, frameRateOverrides.at(1234));

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {.touch = true});

    EXPECT_EQ(1u, frameRateOverrides.size());

    ASSERT_EQ(1u, frameRateOverrides.count(1234));

    EXPECT_EQ(60_Hz, frameRateOverrides.at(1234));



    // HighHint case with touch boost and thus should skip frame rate override.

    layers[0].name = "ExplicitCategory HighHint";

    layers[0].vote = LayerVoteType::ExplicitCategory;

    layers[0].desiredRefreshRate = 0_Hz;

    layers[0].frameRateCategory = FrameRateCategory::HighHint;

    layers[1].name = "ExplicitExactOrMultiple 30";

    layers[1].vote = LayerVoteType::ExplicitExactOrMultiple;

    layers[1].desiredRefreshRate = 30_Hz;

    layers[1].frameRateCategory = FrameRateCategory::Default;

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {});

    EXPECT_TRUE(frameRateOverrides.empty());

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {.touch = true});

    EXPECT_TRUE(frameRateOverrides.empty());



    // HighHint case with touch boost and thus should skip frame rate override.

    layers[0].name = "ExplicitCategory HighHint";

    layers[0].vote = LayerVoteType::ExplicitCategory;

    layers[0].desiredRefreshRate = 0_Hz;

    layers[0].frameRateCategory = FrameRateCategory::HighHint;

    layers[1].name = "ExplicitExact 60";

    layers[1].vote = LayerVoteType::ExplicitExact;

    layers[1].desiredRefreshRate = 60_Hz;

    layers[1].frameRateCategory = FrameRateCategory::Default;

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {});

    EXPECT_TRUE(frameRateOverrides.empty());

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {.touch = true});

    EXPECT_TRUE(frameRateOverrides.empty());



    // HighHint case with touch boost and thus should skip frame rate override.

    layers[0].name = "ExplicitCategory HighHint";

    layers[0].vote = LayerVoteType::ExplicitCategory;

    layers[0].desiredRefreshRate = 0_Hz;

    layers[0].frameRateCategory = FrameRateCategory::HighHint;

    layers[1].name = "ExplicitGte 60";

    layers[1].vote = LayerVoteType::ExplicitGte;

    layers[1].desiredRefreshRate = 60_Hz;

    layers[1].frameRateCategory = FrameRateCategory::Default;

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {});

    EXPECT_TRUE(frameRateOverrides.empty());

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {.touch = true});

    EXPECT_TRUE(frameRateOverrides.empty());



    // ExplicitCategory case that expects no global touch boost and thus has frame rate override.

    layers[0].name = "ExplicitDefault 60";

    layers[0].vote = LayerVoteType::ExplicitDefault;

    layers[0].desiredRefreshRate = 60_Hz;

    layers[0].frameRateCategory = FrameRateCategory::Default;

    layers[1].name = "ExplicitCategory High";

    layers[1].vote = LayerVoteType::ExplicitCategory;

    layers[1].desiredRefreshRate = 0_Hz;

    layers[1].frameRateCategory = FrameRateCategory::High;

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {});

    EXPECT_EQ(1u, frameRateOverrides.size());

    ASSERT_EQ(1u, frameRateOverrides.count(1234));

    EXPECT_EQ(120_Hz, frameRateOverrides.at(1234));

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {.touch = true});

    EXPECT_EQ(1u, frameRateOverrides.size());

    ASSERT_EQ(1u, frameRateOverrides.count(1234));

    EXPECT_EQ(120_Hz, frameRateOverrides.at(1234));



    // ExplicitCategory case that expects no global touch boost and thus has frame rate override.

    layers[0].name = "ExplicitDefault 60";

    layers[0].vote = LayerVoteType::ExplicitDefault;

    layers[0].desiredRefreshRate = 60_Hz;

    layers[0].frameRateCategory = FrameRateCategory::Default;

    layers[1].name = "ExplicitCategory Normal";

    layers[1].vote = LayerVoteType::ExplicitCategory;

    layers[1].desiredRefreshRate = 0_Hz;

    layers[1].frameRateCategory = FrameRateCategory::Normal;

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {});

    EXPECT_EQ(1u, frameRateOverrides.size());

    ASSERT_EQ(1u, frameRateOverrides.count(1234));

    EXPECT_EQ(60_Hz, frameRateOverrides.at(1234));

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {.touch = true});

    EXPECT_EQ(1u, frameRateOverrides.size());

    ASSERT_EQ(1u, frameRateOverrides.count(1234));

    EXPECT_EQ(60_Hz, frameRateOverrides.at(1234));



    // ExplicitCategory case that expects no global touch boost and thus has frame rate override.

    layers[0].name = "ExplicitDefault 60";

    layers[0].vote = LayerVoteType::ExplicitDefault;

    layers[0].desiredRefreshRate = 60_Hz;

    layers[0].frameRateCategory = FrameRateCategory::Default;

    layers[1].name = "ExplicitCategory Low";

    layers[1].vote = LayerVoteType::ExplicitCategory;

    layers[1].desiredRefreshRate = 0_Hz;

    layers[1].frameRateCategory = FrameRateCategory::Low;

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {});

    EXPECT_EQ(1u, frameRateOverrides.size());

    ASSERT_EQ(1u, frameRateOverrides.count(1234));

    EXPECT_EQ(60_Hz, frameRateOverrides.at(1234));

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {.touch = true});

    EXPECT_EQ(1u, frameRateOverrides.size());

    ASSERT_EQ(1u, frameRateOverrides.count(1234));

    EXPECT_EQ(60_Hz, frameRateOverrides.at(1234));



    // ExplicitCategory case that expects no global touch boost and thus has frame rate override.

    layers[0].name = "ExplicitDefault 60";

    layers[0].vote = LayerVoteType::ExplicitDefault;

    layers[0].desiredRefreshRate = 60_Hz;

    layers[0].frameRateCategory = FrameRateCategory::Default;

    layers[1].name = "ExplicitCategory NoPreference";

    layers[1].vote = LayerVoteType::ExplicitCategory;

    layers[1].desiredRefreshRate = 0_Hz;

    layers[1].frameRateCategory = FrameRateCategory::NoPreference;

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {});

    EXPECT_EQ(1u, frameRateOverrides.size());

    ASSERT_EQ(1u, frameRateOverrides.count(1234));

    EXPECT_EQ(60_Hz, frameRateOverrides.at(1234));

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {.touch = true});

    EXPECT_EQ(1u, frameRateOverrides.size());

    ASSERT_EQ(1u, frameRateOverrides.count(1234));

    EXPECT_EQ(60_Hz, frameRateOverrides.at(1234));

}



TEST_P(RefreshRateSelectorTest, getFrameRateOverrides_touch) {

    if (GetParam() == Config::FrameRateOverride::Disabled) {

        return;
@@ -3204,6 +3408,17 @@ TEST_P(RefreshRateSelectorTest, getFrameRateOverrides_touch) { 


    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {.touch = true});

    EXPECT_TRUE(frameRateOverrides.empty());



    layers[0].vote = LayerVoteType::ExplicitGte;

    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {});

    EXPECT_EQ(1u, frameRateOverrides.size());

    ASSERT_EQ(1u, frameRateOverrides.count(1234));

    EXPECT_EQ(60_Hz, frameRateOverrides.at(1234));



    frameRateOverrides = selector.getFrameRateOverrides(layers, 120_Hz, {.touch = true});

    EXPECT_EQ(1u, frameRateOverrides.size());

    ASSERT_EQ(1u, frameRateOverrides.count(1234));

    EXPECT_EQ(60_Hz, frameRateOverrides.at(1234));

}



TEST_P(RefreshRateSelectorTest, getFrameRateOverrides_DivisorIsNotDisplayRefreshRate) {