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

Commit 04b5f284 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11456215 from a51f1d63 to 24Q2-release 

Change-Id: I9120d447add5c2f1cf63bf6aa0760dd624dab04a
parents 78791927 a51f1d63

libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -984,7 +984,7 @@ int main(int argc, char* argv[]) { 
        return generatedFlaggedService(test_flags, kBinderNdkUnitTestServiceFlagged);

    }



    ABinderProcess_setThreadPoolMaxThreadCount(1);  // to receive death notifications/callbacks

    ABinderProcess_setThreadPoolMaxThreadCount(0);

    ABinderProcess_startThreadPool();



    return RUN_ALL_TESTS();

libs/renderengine/skia/filters/KawaseBlurFilter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ sk_sp<SkImage> KawaseBlurFilter::generate(GrRecordingContext* context, 
    constexpr int kSampleCount = 1;

    constexpr bool kMipmapped = false;

    constexpr SkSurfaceProps* kProps = nullptr;

    sk_sp<SkSurface> surface = SkSurfaces::RenderTarget(context, skgpu::Budgeted::kYes, scaledInfo,

    sk_sp<SkSurface> surface = SkSurfaces::RenderTarget(context, skgpu::Budgeted::kNo, scaledInfo,

                                                        kSampleCount, kTopLeft_GrSurfaceOrigin,

                                                        kProps, kMipmapped, input->isProtected());

    LOG_ALWAYS_FATAL_IF(!surface, "%s: Failed to create surface for blurring!", __func__);

services/surfaceflinger/Scheduler/LayerInfo.cpp

+2 −1
Original line number Diff line number Diff line
@@ -327,7 +327,8 @@ LayerInfo::RefreshRateVotes LayerInfo::getRefreshRateVote(const RefreshRateSelec 
            mLayerVote.type != LayerHistory::LayerVoteType::ExplicitDefault) {

            ATRACE_FORMAT_INSTANT("Vote %s", ftl::enum_string(mLayerVote.type).c_str());

            ALOGV("%s voted %d", mName.c_str(), static_cast<int>(mLayerVote.type));

            votes.push_back(mLayerVote);

            votes.push_back({mLayerVote.type, mLayerVote.fps, mLayerVote.seamlessness,

                             FrameRateCategory::Default, mLayerVote.categorySmoothSwitchOnly});

        }



        return votes;

services/surfaceflinger/tests/unittests/LayerHistoryTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ TEST_F(LayerHistoryTest, oneLayerExplicitVoteWithCategory) { 
    // Second LayerRequirement is the frame rate specification

    EXPECT_EQ(LayerHistory::LayerVoteType::ExplicitDefault, summarizeLayerHistory(time)[1].vote);

    EXPECT_EQ(73.4_Hz, summarizeLayerHistory(time)[1].desiredRefreshRate);

    EXPECT_EQ(FrameRateCategory::High, summarizeLayerHistory(time)[1].frameRateCategory);

    EXPECT_EQ(FrameRateCategory::Default, summarizeLayerHistory(time)[1].frameRateCategory);



    // layer became inactive, but the vote stays

    setDefaultLayerVote(layer.get(), LayerHistory::LayerVoteType::Heuristic);

services/surfaceflinger/tests/unittests/LayerInfoTest.cpp

+5 −2
Original line number Diff line number Diff line
@@ -213,7 +213,8 @@ TEST_F(LayerInfoTest, getRefreshRateVote_explicitVote) { 
TEST_F(LayerInfoTest, getRefreshRateVote_explicitVoteWithCategory) {

    LayerInfo::LayerVote vote = {.type = LayerHistory::LayerVoteType::ExplicitDefault,

                                 .fps = 20_Hz,

                                 .category = FrameRateCategory::High};

                                 .category = FrameRateCategory::High,

                                 .categorySmoothSwitchOnly = true};

    layerInfo.setLayerVote(vote);



    auto actualVotes =
@@ -221,10 +222,12 @@ TEST_F(LayerInfoTest, getRefreshRateVote_explicitVoteWithCategory) { 
    ASSERT_EQ(actualVotes.size(), 2u);

    ASSERT_EQ(actualVotes[0].type, LayerHistory::LayerVoteType::ExplicitCategory);

    ASSERT_EQ(actualVotes[0].category, vote.category);

    ASSERT_TRUE(actualVotes[0].categorySmoothSwitchOnly);

    ASSERT_EQ(actualVotes[1].type, vote.type);

    ASSERT_EQ(actualVotes[1].fps, vote.fps);

    ASSERT_EQ(actualVotes[1].seamlessness, vote.seamlessness);

    ASSERT_EQ(actualVotes[1].category, vote.category);

    ASSERT_EQ(actualVotes[1].category, FrameRateCategory::Default);

    ASSERT_TRUE(actualVotes[1].categorySmoothSwitchOnly);

}



TEST_F(LayerInfoTest, getRefreshRateVote_explicitCategory) {