diff options
| author | Conn O'Griofa <connogriofa@gmail.com> | 2013-01-04 19:43:50 -0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2013-01-20 20:11:00 -0800 |
| commit | 47461baea89ba2483395082e9271ed9d94d1436b (patch) | |
| tree | 7c02c531b156033edfc6d9c1de75e910df848de2 /core/jni/android | |
| parent | c689d18ed42bff67d6a9ece4de5c3528e5441a45 (diff) | |
| download | frameworks_base-47461baea89ba2483395082e9271ed9d94d1436b.zip frameworks_base-47461baea89ba2483395082e9271ed9d94d1436b.tar.gz frameworks_base-47461baea89ba2483395082e9271ed9d94d1436b.tar.bz2 | |
Allow purging of asset bitmaps
It seems that neither CM9 nor CM10.x includes the actual framework-side
code to facilitate user-controllable bitmap purging. Odd, since the
CyanogenMod Settings app in both CM9/CM10.x includes the option.
Backported from original Gingerbread commit:
http://review.cyanogenmod.org/#/c/3908
Original description:
Allow the system to reclaim more free RAM when needed on 'low' memory devices
(e.g. Droid/Milestone) that are struggling with 2.3. This option enabled
efectively restores the froyo way of forcePurgeable BitmapFactory asset
handling.
Change-Id: I6a3b8a05b7be9c214a8548d6c6d1621e6533a1e0
Diffstat (limited to 'core/jni/android')
| -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, |