diff options
| author | Romain Guy <romainguy@google.com> | 2010-08-19 15:18:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-19 15:18:34 -0700 |
| commit | 9a5c6e4f56e574e7591d8d3af1c2b64053df407f (patch) | |
| tree | a2330119a5a1abc46d2970e310a1f2cc6df2c9c8 | |
| parent | d88e0680edd88e10870d5f6f303633cea839d686 (diff) | |
| parent | 18ef37258d897928c68b89535a93b99d8a817d3c (diff) | |
| download | frameworks_base-9a5c6e4f56e574e7591d8d3af1c2b64053df407f.zip frameworks_base-9a5c6e4f56e574e7591d8d3af1c2b64053df407f.tar.gz frameworks_base-9a5c6e4f56e574e7591d8d3af1c2b64053df407f.tar.bz2 | |
am 18ef3725: DO NOT MERGE. Fix the build.
Merge commit '18ef37258d897928c68b89535a93b99d8a817d3c' into gingerbread-plus-aosp
* commit '18ef37258d897928c68b89535a93b99d8a817d3c':
DO NOT MERGE. Fix the build.
| -rw-r--r-- | core/jni/android/graphics/BitmapFactory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp index f572477..254d9a4 100644 --- a/core/jni/android/graphics/BitmapFactory.cpp +++ b/core/jni/android/graphics/BitmapFactory.cpp @@ -465,7 +465,8 @@ static jobject nativeDecodeAsset(JNIEnv* env, jobject clazz, jobject options) { // BitmapFactory$Options SkStream* stream; 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 // and we could assume optionsShareable, since assets are always RO stream = copyAssetToStream(asset); |