commit 6d3fae21a80ad73fa3fea77e7c74d8df28327efa
author Karsten Tausche <karsten@fairphone.com> Thu Aug 26 18:20:02 2021 +0200
committer Karsten Tausche <karsten@fairphone.com> Thu Aug 26 18:20:02 2021 +0200
tree 3be4466074e6ad3a1edb6008f2e64fe9fd65ca6b
parent 39c064de0b98a5184a8537c11ad8320e5d7dcec1
parent 1c96782efb59203b6f4d07b87c8db7716bc60bd7

Merge tag 'android-security-10.0.0_r53' into int/10/fp2

Android security 10.0.0 release 53

* tag 'android-security-10.0.0_r53':
  hidl_test_java: reflect new overread check in art
  Revert "Fillout requesting SID."
  Revert "Fillout requesting SID."

Change-Id: I1c3e36b0ffdb177a6dae0c97fbe52a33f53332d7

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 a7467d7..ba12625 100644
--- a/test/java_test/hidl_test_java_native.cpp
+++ b/test/java_test/hidl_test_java_native.cpp
@@ -178,13 +178,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) {