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

Commit 25ae8083 authored by Hsin-Yi Chen's avatar Hsin-Yi Chen Committed by android-build-merger
Browse files

Merge "Merge "Cast binder data type to uint64_t in high bits test" am:... 

Merge "Merge "Cast binder data type to uint64_t in high bits test" am: 3c80f175 am: 2ca98909 am: 825e67f1" into oc-dr1-dev-plus-aosp
am: 3d317cab

Change-Id: If334c9dc8742cb0411a51b5bdb1e4429d1f2ca1b
parents 962ca538 3d317cab

libs/binder/tests/binderLibTest.cpp

+4 −4
Original line number Diff line number Diff line
@@ -778,10 +778,10 @@ TEST_F(BinderLibTest, CheckHandleZeroBinderHighBitsZeroCookie) { 


    const flat_binder_object *fb = reply.readObject(false);

    ASSERT_TRUE(fb != NULL);

    EXPECT_EQ(fb->hdr.type, BINDER_TYPE_HANDLE);

    EXPECT_EQ(ProcessState::self()->getStrongProxyForHandle(fb->handle), m_server);

    EXPECT_EQ(fb->cookie, (binder_uintptr_t)0);

    EXPECT_EQ(fb->binder >> 32, (binder_uintptr_t)0);

    EXPECT_EQ(BINDER_TYPE_HANDLE, fb->hdr.type);

    EXPECT_EQ(m_server, ProcessState::self()->getStrongProxyForHandle(fb->handle));

    EXPECT_EQ((binder_uintptr_t)0, fb->cookie);

    EXPECT_EQ((uint64_t)0, (uint64_t)fb->binder >> 32);

}



TEST_F(BinderLibTest, FreedBinder) {