BitmapFactory: fix missing bitmaps if purgeable assets option is used

Change-Id: I3be1e9d02a21994ac496b1298b141de21b28cb1a
nadlabak · Oct 29, 2012 · aa2943e · aa2943e
1 parent e8a9ac6
commit aa2943e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp
@@ -492,7 +492,7 @@ static jobject nativeDecodeAssetScaled(JNIEnv* env, jobject clazz, jint native_a
 
     SkStream* stream;
     Asset* asset = reinterpret_cast<Asset*>(native_asset);
-    bool forcePurgeable = optionsPurgeable(env, options) || mPurgeableAssets;
+    bool forcePurgeable = optionsPurgeable(env, options) || (mPurgeableAssets && !applyScale);
     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