Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36ad54ac authored by Mike Reed's avatar Mike Reed
Browse files

force purgeability for assets 

Change-Id: I1067cfb91846a05290ed26ce9a62eb82d3170719
http://b/issue?id=1860187
parent 49658cb5

core/jni/android/graphics/BitmapFactory.cpp

+8 −4
Original line number Diff line number Diff line
@@ -331,12 +331,14 @@ static SkPixelRef* installPixelRef(SkBitmap* bitmap, SkStream* stream, 
// i.e. dynamically allocated, since its lifetime may exceed the current stack

// frame.

static jobject doDecode(JNIEnv* env, SkStream* stream, jobject padding,

                        jobject options, bool allowPurgeable) {

                        jobject options, bool allowPurgeable,

                        bool forcePurgeable = false) {

    int sampleSize = 1;

    SkImageDecoder::Mode mode = SkImageDecoder::kDecodePixels_Mode;

    SkBitmap::Config prefConfig = SkBitmap::kNo_Config;

    bool doDither = true;

    bool isPurgeable = allowPurgeable && optionsPurgeable(env, options);

    bool isPurgeable = forcePurgeable ||

                        (allowPurgeable && optionsPurgeable(env, options));

    bool reportSizeToVM = optionsReportSizeToVM(env, options);

    

    if (NULL != options) {
@@ -568,8 +570,10 @@ static jobject nativeDecodeAsset(JNIEnv* env, jobject clazz, 
                                 jobject options) { // BitmapFactory$Options

    SkStream* stream;

    Asset* asset = reinterpret_cast<Asset*>(native_asset);

    // assets can always be rebuilt, so force this

    bool forcePurgeable = true;



    if (optionsPurgeable(env, options)) {

    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);
@@ -582,7 +586,7 @@ static jobject nativeDecodeAsset(JNIEnv* env, jobject clazz, 
        stream = new AssetStreamAdaptor(asset);

    }

    SkAutoUnref aur(stream);

    return doDecode(env, stream, padding, options, true);

    return doDecode(env, stream, padding, options, true, forcePurgeable);

}



static jobject nativeDecodeByteArray(JNIEnv* env, jobject, jbyteArray byteArray,