diff options
| -rw-r--r-- | core/jni/android/graphics/BitmapFactory.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp index 8823328..07603f4 100644 --- a/core/jni/android/graphics/BitmapFactory.cpp +++ b/core/jni/android/graphics/BitmapFactory.cpp @@ -15,6 +15,7 @@ #include "JNIHelp.h" #include <android_runtime/AndroidRuntime.h> +#include <cutils/properties.h> #include <androidfw/Asset.h> #include <androidfw/ResourceTypes.h> #include <netinet/in.h> @@ -45,6 +46,8 @@ jfieldID gBitmap_layoutBoundsFieldID; using namespace android; +bool mPurgeableAssets; + static inline int32_t validOrNeg1(bool isValid, int32_t value) { // return isValid ? value : -1; SkASSERT((int)isValid == 0 || (int)isValid == 1); @@ -491,8 +494,8 @@ static jobject nativeDecodeAssetScaled(JNIEnv* env, jobject clazz, jint native_a SkStream* stream; Asset* asset = reinterpret_cast<Asset*>(native_asset); - bool forcePurgeable = optionsPurgeable(env, options); - if (forcePurgeable) { + bool forcePurgeable = mPurgeableAssets; + if (forcePurgeable || optionsPurgeable(env, options)) { // 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); @@ -616,6 +619,11 @@ int register_android_graphics_BitmapFactory(JNIEnv* env) { SkASSERT(bitmap_class); gBitmap_nativeBitmapFieldID = getFieldIDCheck(env, bitmap_class, "mNativeBitmap", "I"); gBitmap_layoutBoundsFieldID = getFieldIDCheck(env, bitmap_class, "mLayoutBounds", "[I"); + + char value[PROPERTY_VALUE_MAX]; + property_get("persist.sys.purgeable_assets", value, "0"); + mPurgeableAssets = atoi(value) == 1; + int ret = AndroidRuntime::registerNativeMethods(env, "android/graphics/BitmapFactory$Options", gOptionsMethods, |