Merge "Fix handling of wrapped processes [part 1]."

2015-01-19 15:00:00 +00:00
parent 4ac5775d63 6ac7e67168
commit e315feeaff
1 changed files with 2 additions and 0 deletions
--- 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);
            }

            /**