Merge "fix 'adb shell'"

am: 1d284004af

Change-Id: Ibc4532047231bc93ff876f13c328957e3cc2cffa
This commit is contained in:
Maciej Żenczykowski 2019-11-12 04:32:01 -08:00 committed by android-build-merger
commit edf501ac81

View file

@ -355,8 +355,8 @@ static __inline__ int get_fd_flags(borrowed_fd fd) {
static __inline__ void close_on_exec(borrowed_fd fd) {
int flags = get_fd_flags(fd);
if (flags >= 0 && (flags & O_CLOEXEC) == 0) {
fcntl(fd.get(), F_SETFD, flags | O_CLOEXEC);
if (flags >= 0 && (flags & FD_CLOEXEC) == 0) {
fcntl(fd.get(), F_SETFD, flags | FD_CLOEXEC);
}
}