summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHsin-Yi Chen <hsinyichen@google.com>2017-08-10 06:03:47 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-10 06:03:47 +0000
commitc165493cfe23241004666ec8885236b35c6e1233 (patch)
treee67e750ff1c98d3c787bb70a22b89c9a9638e27f
parent0436b01d1b48c55e59d8ad21187c0e80b7828a9f (diff)
parent7e04edd5b3f0ca9a2d8bca78d5ae70c09b623299 (diff)
downloadnative-c165493cfe23241004666ec8885236b35c6e1233.tar.gz
Cast binder data type to uint64_t in high bits test
am: 7e04edd5b3 Change-Id: Idad9b44edb27f34ac1bebebfe07b1246c348804e
-rw-r--r--libs/binder/tests/binderLibTest.cpp8
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) {