Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88 am: 2399d935bc am: f32424b90d

Browse Source 
am: 54c2cbb0f9

Change-Id: Iae83cebe615d0df3a6f2c6bdee6f8002d3ae82b0
This commit is contained in:
Leon Scroggins III
2017-10-06 16:53:46 +00:00
committed by android-build-merger
parent a8c4c7aa94 54c2cbb0f9
commit 85a68d9e71
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/android/graphics/BitmapFactory.cpp
View File

@@ -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) {

3
media/jni/android_media_ExifInterface.cpp
View File

@@ -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);
}