| commit | a39f5a7fd147de4d0e1ec361e3789e1abb0ceab5 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Aug 23 05:29:49 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 23 05:29:49 2022 +0000 |
| tree | 43465ded1524b21d1c6ef7902bc9b64f530da599 | |
| parent | 899368803a7b1800b76f802af75c50c5977d9383 [diff] | |
| parent | f2c5f522879ae472ee19607841f7fb30d0de9466 [diff] |
Merge "libbinder: return error correctly in RpcTransportTipcAndroid" am: 62bb50a6ed am: 02a1709067 am: 3ce90ee7c8 am: 52753e6e43 am: f2c5f52287 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2189663 Change-Id: I7f812f285ff63dbe37a15b7dd62bff58353a0f87 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;