diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-08-11 10:28:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-08-11 10:28:57 +0000 |
| commit | 3c80f17536907ca8aad12e5b75c8f6d9ebf3bc52 (patch) | |
| tree | 586d63d75067bf4c8a745be1d6db90b36f7fc2cc | |
| parent | 8f93ab17f91be9c170f946540fb82cd71d792891 (diff) | |
| parent | ad6503cf91e1ef0e3c1595e143ab9e11f0da5530 (diff) | |
| download | native-3c80f17536907ca8aad12e5b75c8f6d9ebf3bc52.tar.gz | |
Merge "Cast binder data type to uint64_t in high bits test"
| -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 c8e478a356..71aa9a305d 100644 --- a/libs/binder/tests/binderLibTest.cpp +++ b/libs/binder/tests/binderLibTest.cpp @@ -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) { |