| commit | 62fab1be639907c6c362712b8291e53a033d4820 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue Jul 28 22:06:14 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 28 22:06:14 2020 +0000 |
| tree | 6fd4d4766b8bc076687712af792550ac3f84b4a0 | |
| parent | 568a7230b116be78bf2c80b903b74517baaf2b3d [diff] | |
| parent | 7390b72d6db3380a9175775c4f006275bb52fcb4 [diff] |
libbinder: setupPolling returns status_t am: d8c85672fc am: 587420d8d9 am: d0d0535155 am: 7390b72d6d Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1372253 Change-Id: Iad6834177c61c00d8253d86a59537591dbe19694
diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index d67ce15..157538e 100644 --- a/libs/binder/IPCThreadState.cpp +++ b/libs/binder/IPCThreadState.cpp
@@ -614,7 +614,7 @@ talkWithDriver(false); } -int IPCThreadState::setupPolling(int* fd) +status_t IPCThreadState::setupPolling(int* fd) { if (mProcess->mDriverFD < 0) { return -EBADF;
diff --git a/libs/binder/include/binder/IPCThreadState.h b/libs/binder/include/binder/IPCThreadState.h index 8d51cdc..2bd39a7 100644 --- a/libs/binder/include/binder/IPCThreadState.h +++ b/libs/binder/include/binder/IPCThreadState.h
@@ -85,8 +85,8 @@ int64_t clearCallingIdentity(); // Restores PID/UID (not SID) void restoreCallingIdentity(int64_t token); - - int setupPolling(int* fd); + + status_t setupPolling(int* fd); status_t handlePolledCommands(); void flushCommands();