diff options
| author | 2024-05-21 00:05:11 +0000 | |
|---|---|---|
| committer | 2024-05-21 01:52:21 +0000 | |
| commit | a7e2e593cf08722114106c8b6f29b18c2b144f9f (patch) | |
| tree | d10dd58bbff15bda0b366e1852b731c1c9dab99c | |
| parent | f5ecee638ca6b06042af0d9f495df1f8b813b902 (diff) | |
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
| -rw-r--r-- | libs/hwui/jni/BitmapFactory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/jni/BitmapFactory.cpp b/libs/hwui/jni/BitmapFactory.cpp index 3d0a53440bfb..785aef312072 100644 --- a/libs/hwui/jni/BitmapFactory.cpp +++ b/libs/hwui/jni/BitmapFactory.cpp @@ -688,8 +688,8 @@ 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 - return nullObjectReturn("Not supported on Windows"); +#ifdef _WIN32 // LayoutLib for Windows does not support F_DUPFD_CLOEXEC + return nullObjectReturn("Not supported on Windows"); #else NPE_CHECK_RETURN_ZERO(env, fileDescriptor); |