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

Commit b58cebaa authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder: Use correct data size in appendFrom test" am: 7fd163e6 am:... 

Merge "libbinder: Use correct data size in appendFrom test" am: 7fd163e6 am: caf1905a am: b2f24d3f am: d729574a am: 054c6a2c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128761



Change-Id: I12e885a78ef00628ebae9355a6171bae68f31b13
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6e377395 054c6a2c

libs/binder/tests/binderRpcTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -755,7 +755,7 @@ TEST_P(BinderRpc, AppendSeparateFormats) { 
    p1.markForBinder(proc1.rootBinder);

    p1.writeInt32(3);



    EXPECT_EQ(BAD_TYPE, p1.appendFrom(&pRaw, 0, p1.dataSize()));

    EXPECT_EQ(BAD_TYPE, p1.appendFrom(&pRaw, 0, pRaw.dataSize()));

    EXPECT_EQ(BAD_TYPE, pRaw.appendFrom(&p1, 0, p1.dataSize()));



    Parcel p2;