diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-19 15:16:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-19 15:16:58 +0000 |
| commit | 1f7d657b43fd7d40c402340c02ece5beb4b28c52 (patch) | |
| tree | 1a35ed37f6db8ec040956f2c3c2bd7ed5559fb74 /core/java/com | |
| parent | bb0bb9aebb76a516bae7b32054852eb828a8ece8 (diff) | |
| parent | 3e809794fe558d8a10851c0ac22a65a2c81fa315 (diff) | |
| download | frameworks_base-1f7d657b43fd7d40c402340c02ece5beb4b28c52.zip frameworks_base-1f7d657b43fd7d40c402340c02ece5beb4b28c52.tar.gz frameworks_base-1f7d657b43fd7d40c402340c02ece5beb4b28c52.tar.bz2 | |
am 3e809794: am e315feea: Merge "Fix handling of wrapped processes [part 1]."
* commit '3e809794fe558d8a10851c0ac22a65a2c81fa315':
Fix handling of wrapped processes [part 1].
Diffstat (limited to 'core/java/com')
| -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); } /** |