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

Merge "Retry on signal." into sc-dev am: 5fcb94848d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15132638

Change-Id: I2071595682b3a69f3b2eb454c2b49cb797ad67c2
This commit is contained in:
TreeHugger Robot
2021-06-29 02:31:47 +00:00
committed by Automerger Merge Worker
parent 61104a15f5 5fcb94848d
commit 097fdb1bce
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/jni/com_android_server_pm_PackageManagerShellCommandDataLoader.cpp
View File

@@ -133,8 +133,12 @@ static bool sendRequest(int fd, RequestType requestType, FileIdx fileIdx = -1,
static int waitForDataOrSignal(int fd, int event_fd) {
struct pollfd pfds[2] = {{fd, POLLIN, 0}, {event_fd, POLLIN, 0}};
// Wait indefinitely until either data is ready or stop signal is received
// Wait until either data is ready or stop signal is received
int res = poll(pfds, 2, PollTimeoutMs);
if (res == -1 && errno == EINTR) {
// Treat it the same as timeout and allow the caller to retry.
return 0;
}
if (res <= 0) {
return res;
}