From adb5e0ba6d532c0d52b3bf89a1dbec4e3e7a6fd6 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Fri, 10 Mar 2017 10:50:33 -0500 Subject: [PATCH] Stop explicitly using kCallerPasses_Ownership Bug: 65646012 Bug: 65426286 Cherry-picked from master. The original CL just updates BitmapFactory. This also updates ExifInterface in the same way. ExifInterface.cpp no longer existed by the time the Skia change landed. Required for Ib7aaf367f68f8764147887d858f65ee14fa7a1d9, which fixes the aforementioned bugs. Test: No change in behavior, no new tests. This enum is going away in https://skia-review.googlesource.com/c/9498, and this method is using the default anyway. Merged-In: I928a72851f90e84f45ce2fa49560f8ba894a8058 Merged-In: I8f6c761e50cb29476dc0784f58908ec35e3c70e9 Change-Id: I928a72851f90e84f45ce2fa49560f8ba894a8058 --- core/jni/android/graphics/BitmapFactory.cpp | 3 +-- media/jni/android_media_ExifInterface.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp index 4001283c4c66b..0a143610ebd7e 100644 --- a/core/jni/android/graphics/BitmapFactory.cpp +++ b/core/jni/android/graphics/BitmapFactory.cpp @@ -587,8 +587,7 @@ 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) { diff --git a/media/jni/android_media_ExifInterface.cpp b/media/jni/android_media_ExifInterface.cpp index 731deae146030..20f9ef6d6a492 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); }