diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp index 4001283c4c6..2d1254e13ff 100644 --- a/core/jni/android/graphics/BitmapFactory.cpp +++ b/core/jni/android/graphics/BitmapFactory.cpp @@ -587,9 +587,8 @@ static jobject nativeDecodeFileDescriptor(JNIEnv* env, jobject clazz, jobject fi return nullObjectReturn("Could not open file"); } - std::unique_ptr fileStream(new SkFILEStream(file, - SkFILEStream::kCallerPasses_Ownership)); - + std::unique_ptr fileStream(new SkFILEStream(file)); + // If there is no offset for the file descriptor, we use SkFILEStream directly. if (::lseek(descriptor, 0, SEEK_CUR) == 0) { assert(isSeekable(dupDescriptor)); diff --git a/media/jni/android_media_ExifInterface.cpp b/media/jni/android_media_ExifInterface.cpp index 731deae1460..20f9ef6d6a4 100644 --- a/media/jni/android_media_ExifInterface.cpp +++ b/media/jni/android_media_ExifInterface.cpp @@ -390,8 +390,7 @@ static jobject ExifInterface_getRawAttributesFromFileDescriptor( // Rewind the file descriptor. fseek(file, 0L, SEEK_SET); - std::unique_ptr fileStream(new SkFILEStream(file, - SkFILEStream::kCallerPasses_Ownership)); + std::unique_ptr fileStream(new SkFILEStream(file)); return getRawAttributes(env, fileStream.get(), false); }