diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-23 22:02:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-23 22:02:56 +0000 |
| commit | d7e46dddcb147e341e6f7b5fa0439077c6b1008b (patch) | |
| tree | 4bb8abab137f0d211f5362e0d208e06239b501e6 | |
| parent | ba54d5baf4265cc5ccf656638bf6c5d9e770592f (diff) | |
| parent | 45681ecf27935d8430ace4d20e0d611ad7327e23 (diff) | |
| download | native-d7e46dddcb147e341e6f7b5fa0439077c6b1008b.tar.gz | |
Merge "Cast binder data type to uint64_t in high bits test" into oreo-vts-dev
| -rw-r--r-- | libs/binder/tests/binderLibTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/binder/tests/binderLibTest.cpp b/libs/binder/tests/binderLibTest.cpp index 757291cd2a..a04869ae62 100644 --- a/libs/binder/tests/binderLibTest.cpp +++ b/libs/binder/tests/binderLibTest.cpp @@ -681,10 +681,10 @@ TEST_F(BinderLibTest, CheckHandleZeroBinderHighBitsZeroCookie) { const flat_binder_object *fb = reply.readObject(false); ASSERT_TRUE(fb != NULL); - EXPECT_EQ(fb->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->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) { |