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

Commit 7d53a6bf authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am a4196206: Merge change 3074 into donut 

Merge commit 'a4196206'

* commit 'a4196206':
  Modify the decoding logic in the FD case when a purgeable flag is set,
parents 7642e341 a4196206

core/jni/android/graphics/BitmapFactory.cpp

+5 −2
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static SkPixelRef* installPixelRef(SkBitmap* bitmap, SkStream* stream, 
                                   int sampleSize) {

    SkPixelRef* pr;

    // only use ashmem for large images, since mmaps come at a price

    if (bitmap->getSize() >= 32 * 65536) {

    if (bitmap->getSize() >= 32 * 1024) {

        pr = new SkImageRef_ashmem(stream, bitmap->config(), sampleSize);

    } else {

        pr = new SkImageRef_GlobalPool(stream, bitmap->config(), sampleSize);
@@ -520,7 +520,10 @@ static jobject nativeDecodeFileDescriptor(JNIEnv* env, jobject clazz, 
    */

    AutoFDSeek as(descriptor);



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

    /* Allow purgeable iff we own the FD, i.e., in the puregeable and

       shareable case.

    */

    return doDecode(env, stream, padding, bitmapFactoryOptions, weOwnTheFD);

}



/*  make a deep copy of the asset, and return it as a stream, or NULL if there