commit cfe2352d88243ee2ea98ff36dbd9049f4e12dd68
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Oct 06 15:45:37 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 06 15:45:37 2017 +0000
tree 46755a2a2f3558be04caa7242e058f98e140572a
parent 17735f183a3b7e3e1f89049865ddaa4eee6f3985
parent adb5e0ba6d532c0d52b3bf89a1dbec4e3e7a6fd6

Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev

core/jni/android/graphics/BitmapFactory.cpp

diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp
index 4001283..0a14361 100644
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/core/jni/android/graphics/BitmapFactory.cpp
@@ -587,8 +587,7 @@
         return nullObjectReturn("Could not open file");
     }
 
-    std::unique_ptr<SkFILEStream> fileStream(new SkFILEStream(file,
-            SkFILEStream::kCallerPasses_Ownership));
+    std::unique_ptr<SkFILEStream> fileStream(new SkFILEStream(file));
 
     // If there is no offset for the file descriptor, we use SkFILEStream directly.
     if (::lseek(descriptor, 0, SEEK_CUR) == 0) {

media/jni/android_media_ExifInterface.cpp

diff --git a/media/jni/android_media_ExifInterface.cpp b/media/jni/android_media_ExifInterface.cpp
index 731deae..20f9ef6 100644
--- a/media/jni/android_media_ExifInterface.cpp
+++ b/media/jni/android_media_ExifInterface.cpp
@@ -390,8 +390,7 @@
     // Rewind the file descriptor.
     fseek(file, 0L, SEEK_SET);
 
-    std::unique_ptr<SkFILEStream> fileStream(new SkFILEStream(file,
-                SkFILEStream::kCallerPasses_Ownership));
+    std::unique_ptr<SkFILEStream> fileStream(new SkFILEStream(file));
     return getRawAttributes(env, fileStream.get(), false);
 }