Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97261fc3 authored by Nick Kralevich's avatar Nick Kralevich Committed by android-build-merger
Browse files

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

am: f084e956

Change-Id: Ie81bf3741ecc399861263d69084d8fb3ec2dbe3e
parents 02efb1d7 f084e956

core/jni/android/graphics/Bitmap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1095,7 +1095,7 @@ static jobject Bitmap_createFromParcel(JNIEnv* env, jobject, jobject parcel) { 
#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();