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

Commit d902b267 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix warnings for BufferHubServer_test in oc branch"

parents 57137587 b59847c4

services/bufferhub/tests/Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,8 @@ cc_test { 
        "-DLOG_TAG=\"BufferHubServer_test\"",

        "-DLOG_TAG=\"BufferHubServer_test\"",

        "-DTRACE=0",

        "-DTRACE=0",

        "-DATRACE_TAG=ATRACE_TAG_GRAPHICS",

        "-DATRACE_TAG=ATRACE_TAG_GRAPHICS",

        "-Wall",

        "-Werror",

    ],

    ],

    header_libs: [

    header_libs: [

        "libdvr_headers",

        "libdvr_headers",

services/bufferhub/tests/BufferHubIdGenerator_test.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ TEST_F(BufferHubIdGeneratorTest, TestGenerateUniqueIncrementalID) { 
    // resulting IDs should still keep incresing.

    // resulting IDs should still keep incresing.

    const size_t kTestSize = 10U;

    const size_t kTestSize = 10U;

    uint32_t ids[kTestSize];

    uint32_t ids[kTestSize];

    for (int i = 0; i < kTestSize; ++i) {

    for (size_t i = 0UL; i < kTestSize; ++i) {

        ids[i] = mIdGenerator->getId();

        ids[i] = mIdGenerator->getId();

        EXPECT_NE(ids[i], BufferHubIdGenerator::kInvalidId);

        EXPECT_NE(ids[i], BufferHubIdGenerator::kInvalidId);

        if (i >= 1) {

        if (i >= 1) {

services/bufferhub/tests/BufferNode_test.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ TEST_F(BufferNodeTest, TestAddNewActiveClientsBitToMask_32NewClients) { 




    for (int i = 0; i < BufferHubDefs::kMaxNumberOfClients; ++i) {

    for (int i = 0; i < BufferHubDefs::kMaxNumberOfClients; ++i) {

        new_client_state_mask = buffer_node->AddNewActiveClientsBitToMask();

        new_client_state_mask = buffer_node->AddNewActiveClientsBitToMask();

        EXPECT_NE(new_client_state_mask, 0);

        EXPECT_NE(new_client_state_mask, 0U);

        EXPECT_FALSE(new_client_state_mask & current_mask);

        EXPECT_FALSE(new_client_state_mask & current_mask);

        expected_mask = current_mask | new_client_state_mask;

        expected_mask = current_mask | new_client_state_mask;

        current_mask = buffer_node->GetActiveClientsBitMask();

        current_mask = buffer_node->GetActiveClientsBitMask();