commit f9a784013d8b6d519e66c2bee6384ad8a713ac25
author Steven Moreland <smoreland@google.com> Wed Nov 18 01:16:39 2020 +0000
committer Steven Moreland <smoreland@google.com> Thu Dec 03 23:43:13 2020 +0000
tree acff1f7471ecd4b96316a0dad4f00cf329e537b9
parent 82bf335a78747e57c0f7f52a57a413cc2a9d48f4

hidl_test_java: reflect new overread check in art

This was passing before because of some other checks which caught the
mismatch resulting from an overread.

Ignore-AOSP-First: security

Bug: 172655291
Test: atest hidl_test_java
Merged-In: Ie3766d20597ed9714ab3c3beead8af01226f58ba
Change-Id: Ie3766d20597ed9714ab3c3beead8af01226f58ba
(cherry picked from commit aeae74893c6973959fe58b6e8e045fc4be2b8d32)

test/java_test/hidl_test_java_native.cpp

diff --git a/test/java_test/hidl_test_java_native.cpp b/test/java_test/hidl_test_java_native.cpp
index fff777f..4c479f2 100644
--- a/test/java_test/hidl_test_java_native.cpp
+++ b/test/java_test/hidl_test_java_native.cpp
@@ -301,13 +301,11 @@
         }
     };
 
-    auto ret = baz->someOtherBaseMethod(foo, [&](const auto&) {
-        ADD_FAILURE() << "Should not accept invalid UTF-8 String";
+    auto ret = baz->someOtherBaseMethod(foo, [](const IBase::Foo& ret) {
+        EXPECT_EQ(ret.y.s, "?");  // :)
     });
 
-    EXPECT_FALSE(ret.isOk());
-
-    EXPECT_OK(baz->ping());
+    EXPECT_TRUE(ret.isOk());
 }
 
 TEST_F(HidlTest, BazSomeMethodWithFooArraysTest) {