Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 838e93ed: Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread

Browse Source 
Merge commit '838e93ed19879ce3d88b5be51630137d6a6999c6' into gingerbread-plus-aosp

* commit '838e93ed19879ce3d88b5be51630137d6a6999c6':
  Looper: Drop default parameters in favor of a safer overload.
This commit is contained in:
Jeff Brown
2010-09-17 13:30:20 -07:00
committed by Android Git Automerger
parent 6dcffb434f 838e93ed19
commit bc9599d48c
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/utils/Looper.h
View File

@@ -83,16 +83,20 @@ public:
* This method does not return until it has finished invoking the appropriate callbacks * This method does not return until it has finished invoking the appropriate callbacks
* for all file descriptors that were signalled. * for all file descriptors that were signalled.
*/ */
int pollOnce(int timeoutMillis, int pollOnce(int timeoutMillis, int* outFd, int* outEvents, void** outData);
int* outFd = NULL, int* outEvents = NULL, void** outData = NULL); inline int pollOnce(int timeoutMillis) {
return pollOnce(timeoutMillis, NULL, NULL, NULL);
}
/** /**
* Like pollOnce(), but performs all pending callbacks until all * Like pollOnce(), but performs all pending callbacks until all
* data has been consumed or a file descriptor is available with no callback. * data has been consumed or a file descriptor is available with no callback.
* This function will never return ALOOPER_POLL_CALLBACK. * This function will never return ALOOPER_POLL_CALLBACK.
*/ */
int pollAll(int timeoutMillis, int pollAll(int timeoutMillis, int* outFd, int* outEvents, void** outData);
int* outFd = NULL, int* outEvents = NULL, void** outData = NULL); inline int pollAll(int timeoutMillis) {
return pollAll(timeoutMillis, NULL, NULL, NULL);
}
/** /**
* Wakes the poll asynchronously. * Wakes the poll asynchronously.
@@ -128,8 +132,7 @@ public:
* This method can be called on any thread. * This method can be called on any thread.
* This method may block briefly if it needs to wake the poll. * This method may block briefly if it needs to wake the poll.
*/ */
int addFd(int fd, int ident, int addFd(int fd, int ident, int events, ALooper_callbackFunc callback, void* data);
int events, ALooper_callbackFunc callback, void* data = NULL);
/** /**
* Removes a previously added file descriptor from the looper. * Removes a previously added file descriptor from the looper.