diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-19 15:00:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-19 15:00:00 +0000 |
| commit | e315feeaff544b1d4dd173f0e341398906f4c0c9 (patch) | |
| tree | e896b2ee140c8a63752be8d6c611d5c70b5d00ef | |
| parent | 4ac5775d63791ae3635882a3b49f5ebc253262bb (diff) | |
| parent | 6ac7e67168d89f85f622dd168a05ddfc2644f6d4 (diff) | |
| download | frameworks_base-e315feeaff544b1d4dd173f0e341398906f4c0c9.zip frameworks_base-e315feeaff544b1d4dd173f0e341398906f4c0c9.tar.gz frameworks_base-e315feeaff544b1d4dd173f0e341398906f4c0c9.tar.bz2 | |
Merge "Fix handling of wrapped processes [part 1]."
| -rw-r--r-- | core/java/com/android/internal/os/ZygoteConnection.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java index c03938a..28cd799 100644 --- a/core/java/com/android/internal/os/ZygoteConnection.java +++ b/core/java/com/android/internal/os/ZygoteConnection.java @@ -16,6 +16,7 @@ package com.android.internal.os; +import static android.system.OsConstants.F_SETFD; import static android.system.OsConstants.O_CLOEXEC; import static android.system.OsConstants.STDERR_FILENO; import static android.system.OsConstants.STDIN_FILENO; @@ -194,6 +195,7 @@ class ZygoteConnection { FileDescriptor[] pipeFds = Os.pipe2(O_CLOEXEC); childPipeFd = pipeFds[1]; serverPipeFd = pipeFds[0]; + Os.fcntlInt(childPipeFd, F_SETFD, 0); } /** |