commit 97261fc39ebc3debf4ba102d34c035aaa125e418
author Nick Kralevich <nnk@google.com> Mon Jan 14 22:07:57 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Jan 14 22:07:57 2019 -0800
tree 5bdc44d40ecde43fd5cf4d185544c5d6f230e963
parent 02efb1d721b8e346d013515b03fdb7116b8ee0ec
parent f084e956297f7f148ea34a2e41b5bf240c5da055

Merge "Bitmap.cpp: replace dup() with fcntl(F_DUPFD_CLOEXEC)"
am: f084e95629

Change-Id: Ie81bf3741ecc399861263d69084d8fb3ec2dbe3e

core/jni/android/graphics/Bitmap.cpp

diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index b085bc9..b6fbb0a 100755
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -1095,7 +1095,7 @@
 #endif
         // Dup the file descriptor so we can keep a reference to it after the Parcel
         // is disposed.
-        int dupFd = dup(blob.fd());
+        int dupFd = fcntl(blob.fd(), F_DUPFD_CLOEXEC, 0);
         if (dupFd < 0) {
             ALOGE("Error allocating dup fd. Error:%d", errno);
             blob.release();