Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2399d935 authored by Leon Scroggins III's avatar Leon Scroggins III Committed by android-build-merger
Browse files

Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev 

am: cfe2352d

Change-Id: Id7d59d95e8f5dfa68f7ff55ca5729a11a1fdf1d0
parents d93f91a1 cfe2352d

core/jni/android/graphics/BitmapFactory.cpp

+1 −2
Original line number Diff line number Diff line
@@ -587,8 +587,7 @@ static jobject nativeDecodeFileDescriptor(JNIEnv* env, jobject clazz, jobject fi 
        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

+1 −2
Original line number Diff line number Diff line
@@ -390,8 +390,7 @@ static jobject ExifInterface_getRawAttributesFromFileDescriptor( 
    // 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);

}