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

Commit 175dff2d authored by Elie Kheirallah's avatar Elie Kheirallah Committed by Automerger Merge Worker
Browse files

Merge "Removed unnecessary check. Replaced EXPECT_TRUE with EXPECT_NE." am:...

Merge "Removed unnecessary check. Replaced EXPECT_TRUE with EXPECT_NE." am: 1b78a3ab am: 97b7de9f am: 99054e8a am: eab74d9c am: 04bdaf1d

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



Change-Id: I2c59cb9233c8c9e33fa471c3a2aff70aa92d86c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0269528e 04bdaf1d
Loading
Loading
Loading
Loading
+2 −4
Original line number Original line Diff line number Diff line
@@ -247,13 +247,11 @@ class BinderLibTest : public ::testing::Test {
        {
        {
            int32_t id;
            int32_t id;
            Parcel data, reply;
            Parcel data, reply;
            sp<IBinder> binder;


            EXPECT_THAT(m_server->transact(code, data, &reply), StatusEq(NO_ERROR));
            EXPECT_THAT(m_server->transact(code, data, &reply), StatusEq(NO_ERROR));


            EXPECT_FALSE(binder != nullptr);
            sp<IBinder> binder = reply.readStrongBinder();
            binder = reply.readStrongBinder();
            EXPECT_NE(nullptr, binder);
            EXPECT_TRUE(binder != nullptr);
            EXPECT_THAT(reply.readInt32(&id), StatusEq(NO_ERROR));
            EXPECT_THAT(reply.readInt32(&id), StatusEq(NO_ERROR));
            if (idPtr)
            if (idPtr)
                *idPtr = id;
                *idPtr = id;