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

Commit 9a5c6e4f authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am 18ef3725: DO NOT MERGE. Fix the build. 

Merge commit '18ef3725' into gingerbread-plus-aosp

* commit '18ef3725':
  DO NOT MERGE. Fix the build.
parents d88e0680 18ef3725

core/jni/android/graphics/BitmapFactory.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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);