Merge "Revert "fix 'adb shell'"" am: 0117aabea0

am: 243d810fea

Change-Id: I26aeb80cad7a20bf8c4ed09222bcd8b0a2799d88
This commit is contained in:
Raman Tenneti 2019-11-12 11:10:15 -08:00 committed by android-build-merger
commit cb6e10f909

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 & FD_CLOEXEC) == 0) {
fcntl(fd.get(), F_SETFD, flags | FD_CLOEXEC);
if (flags >= 0 && (flags & O_CLOEXEC) == 0) {
fcntl(fd.get(), F_SETFD, flags | O_CLOEXEC);
}
}