commit | 587420d8d928ca744a5a5c8ef2b0c73084458c79 | [log] [tgz] |
---|---|---|
author | Steven Moreland <smoreland@google.com> | Tue Jul 28 21:11:01 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 28 21:11:01 2020 +0000 |
tree | 2b107dd16f306182cf78b72551aa2ade4ddd6fd1 | |
parent | f16f5ac4336b6231214b64b72a52e9883930b851 [diff] | |
parent | d8c85672fcb1d0db825925ac63b95935da466754 [diff] |
libbinder: setupPolling returns status_t am: d8c85672fc Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1372253 Change-Id: I0a4e9b3a6b3b09f371089a43c5aa602b4441bd03
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();