commit 02a1709067c44ce7e11f9c167f2f0fefb4bf4f2d
author Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 23 04:01:32 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 23 04:01:32 2022 +0000
tree 0cb8c130f933fa5e79aae67409eb52048e7353fe
parent f00a433c4707d0cff31cafcb76fb178fecb52d66
parent 62bb50a6edb019952e106ca037e34d6c1525dcda

Merge "libbinder: return error correctly in RpcTransportTipcAndroid" am: 62bb50a6ed

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2189663

Change-Id: I6cd6791175e6f8df20e9849e243429a540c302bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/binder/RpcTransportTipcAndroid.cpp

diff --git a/libs/binder/RpcTransportTipcAndroid.cpp b/libs/binder/RpcTransportTipcAndroid.cpp
index 79983f4..c82201b 100644
--- a/libs/binder/RpcTransportTipcAndroid.cpp
+++ b/libs/binder/RpcTransportTipcAndroid.cpp
@@ -103,7 +103,10 @@
             // read and call readFn as many times as needed to get all the data
             status_t ret = fillReadBuffer();
             if (ret != OK) {
-                return ret;
+                // We need to emulate a Linux read call, which sets errno on
+                // error and returns -1
+                errno = -ret;
+                return -1;
             }
 
             ssize_t processSize = 0;