From f5607f4cad91b660b99bc332a6897725f603b1f3 Mon Sep 17 00:00:00 2001 From: slip-stream <37628019+slip-stream@users.noreply.github.com> Date: Sat, 31 Mar 2018 13:01:32 +0530 Subject: [PATCH 1/2] Stop explicitly using kCallerPasses_Ownership --- core/jni/android/graphics/BitmapFactory.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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)); From 6ac37dbb879ddfa3a3193469eeff5f3697128b65 Mon Sep 17 00:00:00 2001 From: slip-stream <37628019+slip-stream@users.noreply.github.com> Date: Sat, 31 Mar 2018 13:02:43 +0530 Subject: [PATCH 2/2] Stop explicitly using kCallerPasses_Ownership --- media/jni/android_media_ExifInterface.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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); }