Merge "Revert "fix 'adb shell'""

am: 0117aabea0

Change-Id: Ifeaae5bfd99609bf2f8f51b40874638f4a45762d
This commit is contained in:
Raman Tenneti 2019-11-12 11:05:37 -08:00 committed by android-build-merger
commit 243d810fea

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);
}
}