commit bebece483ad22ce7e48cf48630970ba1fd2c92bb
author Yifan Hong <elsk@google.com> Thu Nov 03 19:24:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 03 19:24:06 2016 +0000
tree 2e43b69089eb89c1fe80f2fa2e39f370bc64919b
parent 16015ba06796fa3ad61a1277ab56775f7871a3b7
parent 64281c8bdcfebf85a66741c5eacdd492c5d6c080

hidl_test: do not use Return for app errors. am: 1f4fbc0793
am: 64281c8bdc

Change-Id: I5dd6ebce7113c0022b406d93018a7a5dda7bdbba

tests/inheritance/1.0/default/Fetcher.cpp

diff --git a/tests/inheritance/1.0/default/Fetcher.cpp b/tests/inheritance/1.0/default/Fetcher.cpp
index 28dffaa..74f8d07 100644
--- a/tests/inheritance/1.0/default/Fetcher.cpp
+++ b/tests/inheritance/1.0/default/Fetcher.cpp
@@ -23,7 +23,7 @@
     if (sendRemote) {
         toSend = IChild::getService("child");
         if (!toSend->isRemote()) {
-            return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE);
+            toSend = nullptr;
         }
     } else {
         toSend = local;