commit c43b5214c2641187f3df56c906acf729a0e721cf
author Steven Moreland <smoreland@google.com> Wed Jul 10 15:23:49 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jul 10 15:23:49 2019 -0700
tree a2084244ee4fb67ae81d45ef0e1009692482e94c
parent 93cf1d5d451237d0600dbe4e9e158567eba1815d
parent 48f2af7772acb09cc720016860c191f6ce62529f

Merge "binderDriverInterfaceTest: fix failure" am: 8cd96a1b87 am: a3c14687bf
am: 48f2af7772

Change-Id: I51fde08325e264972845f8b2d5ddf25a0b4d535c

libs/binder/tests/binderDriverInterfaceTest.cpp

diff --git a/libs/binder/tests/binderDriverInterfaceTest.cpp b/libs/binder/tests/binderDriverInterfaceTest.cpp
index 77ebac8..6508bb1 100644
--- a/libs/binder/tests/binderDriverInterfaceTest.cpp
+++ b/libs/binder/tests/binderDriverInterfaceTest.cpp
@@ -286,7 +286,13 @@
         EXPECT_EQ(0u, br.arg2.cookie);
         EXPECT_EQ(0u, br.arg2.code);
         EXPECT_EQ(0u, br.arg2.flags);
-        EXPECT_EQ(0u, br.arg2.data_size);
+
+        // ping returns a 4 byte header in libbinder, but the original
+        // C implementation of servicemanager returns a 0 byte header
+        if (br.arg2.data_size != 0 && br.arg2.data_size != 4) {
+            ADD_FAILURE() << br.arg2.data_size << " is expected to be 0 or 4";
+        }
+
         EXPECT_EQ(0u, br.arg2.offsets_size);
 
         SCOPED_TRACE("3rd WriteRead");