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

Commit a3c14687 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "binderDriverInterfaceTest: fix failure" 

am: 8cd96a1b

Change-Id: I30e69b9a5f582dec9c374dd1e00c9d0e220beb2d
parents 6915a76f 8cd96a1b

libs/binder/tests/binderDriverInterfaceTest.cpp

+7 −1
Original line number Diff line number Diff line
@@ -286,7 +286,13 @@ TEST_F(BinderDriverInterfaceTest, Transaction) { 
        EXPECT_EQ(0u, br.arg2.cookie);

        EXPECT_EQ(0u, br.arg2.code);

        EXPECT_EQ(0u, br.arg2.flags);

        EXPECT_EQ(0u, br.arg2.data_size);



        // ping returns a 4 byte header in libbinder, but the original

        // C implementation of servicemanager returns a 0 byte header

        if (br.arg2.data_size != 0 && br.arg2.data_size != 4) {

            ADD_FAILURE() << br.arg2.data_size << " is expected to be 0 or 4";

        }



        EXPECT_EQ(0u, br.arg2.offsets_size);



        SCOPED_TRACE("3rd WriteRead");