commit 2ca989096e2e120a6c98c32b359fa5236602e1c7
author Hsin-Yi Chen <hsinyichen@google.com> Fri Aug 11 10:37:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 11 10:37:08 2017 +0000
tree 529c52363a2de7ad0828bd0158cc843bb9d793e1
parent 1bc063272a608bc7d5210e385e805a1398180572
parent 3c80f17536907ca8aad12e5b75c8f6d9ebf3bc52

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

Change-Id: Icf76ccc1b0d6cdf83acb61e88d3b31c8d81853fd

libs/binder/tests/binderLibTest.cpp

diff --git a/libs/binder/tests/binderLibTest.cpp b/libs/binder/tests/binderLibTest.cpp
index c8e478a..71aa9a3 100644
--- a/libs/binder/tests/binderLibTest.cpp
+++ b/libs/binder/tests/binderLibTest.cpp
@@ -778,10 +778,10 @@
 
     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) {