commit a654b4a7fca1d9c7282cdbd8dc75903f8260b004
author Christopher Ferris <cferris@google.com> Sun Jul 30 10:08:18 2017 -0700
committer Christopher Ferris <cferris@google.com> Sun Jul 30 10:08:18 2017 -0700
tree 2a5309940ceb9f090ef59628a612323921898e88
parent 1ab187732d78eab665914edaad9b18f4dea2cb8c

Fix temporary change for new kernel headers.

Test: Built.
Change-Id: I193a0229b4a444b0dbe4e7a632268acc58070dc4

libs/binder/tests/binderLibTest.cpp

diff --git a/libs/binder/tests/binderLibTest.cpp b/libs/binder/tests/binderLibTest.cpp
index ca0d114..34aec5b 100644
--- a/libs/binder/tests/binderLibTest.cpp
+++ b/libs/binder/tests/binderLibTest.cpp
@@ -681,9 +681,7 @@
 
     const flat_binder_object *fb = reply.readObject(false);
     ASSERT_TRUE(fb != NULL);
-    // Temporarily comment this out so that the kernel update can merge into
-    // master.
-    //EXPECT_EQ(fb->hdr.type, BINDER_TYPE_HANDLE);
+    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);