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

Commit f32424b9 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 

am: 2399d935

Change-Id: Ib219c4c5299b681b6f3858cb67c70a7fd9110f20
parents 9865205a 2399d935

core/jni/android/graphics/BitmapFactory.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -587,8 +587,7 @@ static jobject nativeDecodeFileDescriptor(JNIEnv* env, jobject clazz, jobject fi 
        return nullObjectReturn("Could not open file");

        return nullObjectReturn("Could not open file");

    }

    }





    std::unique_ptr<SkFILEStream> fileStream(new SkFILEStream(file,

    std::unique_ptr<SkFILEStream> fileStream(new SkFILEStream(file));

            SkFILEStream::kCallerPasses_Ownership));





    // If there is no offset for the file descriptor, we use SkFILEStream directly.

    // If there is no offset for the file descriptor, we use SkFILEStream directly.

    if (::lseek(descriptor, 0, SEEK_CUR) == 0) {

    if (::lseek(descriptor, 0, SEEK_CUR) == 0) {

media/jni/android_media_ExifInterface.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -390,8 +390,7 @@ static jobject ExifInterface_getRawAttributesFromFileDescriptor( 
    // Rewind the file descriptor.

    // Rewind the file descriptor.

    fseek(file, 0L, SEEK_SET);

    fseek(file, 0L, SEEK_SET);





    std::unique_ptr<SkFILEStream> fileStream(new SkFILEStream(file,

    std::unique_ptr<SkFILEStream> fileStream(new SkFILEStream(file));

                SkFILEStream::kCallerPasses_Ownership));

    return getRawAttributes(env, fileStream.get(), false);

    return getRawAttributes(env, fileStream.get(), false);

}

}