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

am 18ef3725: DO NOT MERGE. Fix the build.

Browse Source 
Merge commit '18ef37258d897928c68b89535a93b99d8a817d3c' into gingerbread-plus-aosp

* commit '18ef37258d897928c68b89535a93b99d8a817d3c':
  DO NOT MERGE. Fix the build.
This commit is contained in:
Romain Guy
2010-08-19 15:18:34 -07:00
committed by Android Git Automerger
parent d88e0680ed 18ef37258d
commit 9a5c6e4f56
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -465,7 +465,8 @@ static jobject nativeDecodeAsset(JNIEnv* env, jobject clazz,
jobject options) { // BitmapFactory$Options jobject options) { // BitmapFactory$Options
SkStream* stream; SkStream* stream;
Asset* asset = reinterpret_cast<Asset*>(native_asset); Asset* asset = reinterpret_cast<Asset*>(native_asset);
if (optionsPurgeable(env, options)) { bool forcePurgeable = optionsPurgeable(env, options);
if (forcePurgeable) {
// if we could "ref/reopen" the asset, we may not need to copy it here // if we could "ref/reopen" the asset, we may not need to copy it here
// and we could assume optionsShareable, since assets are always RO // and we could assume optionsShareable, since assets are always RO
stream = copyAssetToStream(asset); stream = copyAssetToStream(asset);