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

Commit a7e2e593 authored by Michael Hoisie's avatar Michael Hoisie
Browse files

Fix bad merge in nativeDecodeFileDescriptor in BitmapFactory.cpp 

BitmapFactory.deocdeFileDescriptor works as-is on host Linux and host
Mac as they support F_DUPFD_CLOEXEC.

Test: ShadowNativeBitmapFactoryTest in Google3
Bug: 341805079
Change-Id: I00914606e6745681655fcad7090e7f49e9fffc05
parent f5ecee63

libs/hwui/jni/BitmapFactory.cpp

+2 −2
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ static jobject nativeDecodeStream(JNIEnv* env, jobject clazz, jobject is, jbyteA 


static jobject nativeDecodeFileDescriptor(JNIEnv* env, jobject clazz, jobject fileDescriptor,

        jobject padding, jobject bitmapFactoryOptions, jlong inBitmapHandle, jlong colorSpaceHandle) {

#ifndef __ANDROID__ // LayoutLib for Windows does not support F_DUPFD_CLOEXEC

#ifdef _WIN32  // LayoutLib for Windows does not support F_DUPFD_CLOEXEC

    return nullObjectReturn("Not supported on Windows");

#else

    NPE_CHECK_RETURN_ZERO(env, fileDescriptor);