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

Commit 9d8ddd72 authored by Yabin Cui's avatar Yabin Cui Committed by Automerger Merge Worker
Browse files

Merge changes Id4fceb2e,I18f4814d into main am: 487d35c3 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3125914



Change-Id: I94e32496801418fa40d794bbb06a0145f898f3ba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 02ac77ae 487d35c3

media/module/foundation/tests/AData_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ TEST_F(ADataTest, AData_CopyMoveTest) { 
    EXPECT_EQ(2L, _shared.use_count()); // still both u and _shared contains the object



    EXPECT_TRUE(u.clear());

    EXPECT_TRUE(_shared.unique()); // now only _shared contains the object

    EXPECT_EQ(1L, _shared.use_count()); // now only _shared contains the object



    EXPECT_TRUE(u.set(_constShared));

    EXPECT_EQ(2L, _constShared.use_count()); // even though it is const, we can add a use count
@@ -591,7 +591,7 @@ TEST_F(ADataTest, AData_RelaxedCopyMoveTest) { 
    EXPECT_EQ(2L, _shared.use_count()); // still both u and _shared contains the object



    EXPECT_TRUE(u.clear());

    EXPECT_TRUE(_shared.unique()); // now only _shared contains the object

    EXPECT_EQ(1L, _shared.use_count()); // now only _shared contains the object



    EXPECT_TRUE(u.set(_constShared));

    EXPECT_EQ(2L, _constShared.use_count()); // even though it is const, we can add a use count

media/utils/tests/static_string_view_tests.cpp

+0 −2
Original line number Diff line number Diff line
@@ -37,14 +37,12 @@ TEST(StaticStringViewTests, CreateTicket) { 
    // const std::array<char,2> nonstatic = {'a', 'b'};

    // static_assert(can_assign<nonstatic>::value == false);

    static std::array<char, 2> nonconst = {'a', 'b'};

    static const std::array<char, 2> nonconstexpr = {'a', 'b'};

    static constexpr std::array<int, 2> nonchar = {1, 2};

    static constexpr size_t nonarray = 2;



    static_assert(CanCreate<nonconst>::value == false);

    static_assert(CanCreate<nonarray>::value == false);

    static_assert(CanCreate<nonchar>::value == false);

    static_assert(CanCreate<nonconstexpr>::value == false);



    static constexpr std::array<char, 2> scoped = {'a', 'b'};

    constexpr StaticStringView Ticket1 = StaticStringView::create<global>();