| commit | 52753e6e43bcf1384e40430af8ad767e2a91fe87 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Aug 23 04:46:53 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 23 04:46:53 2022 +0000 |
| tree | 072036d3d220d0bec99814049483494c90378c49 | |
| parent | 948dfc53996744053975921db93d66f459a2f1da [diff] | |
| parent | 3ce90ee7c806210c686a4c8ee1f4d6d6100e69f4 [diff] |
Merge "libbinder: return error correctly in RpcTransportTipcAndroid" am: 62bb50a6ed am: 02a1709067 am: 3ce90ee7c8 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2189663 Change-Id: I10db65750744180c2010967057e86a7339d97089 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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;