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

Commit 95fc53b0 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by android-build-merger
Browse files

Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev 

am: 966d6040

* commit '966d6040':
  Limit persistent ashmem backed fds to a minimum of 128kB.
parents a66dc6e1 966d6040

core/java/android/app/Notification.java

+3 −1
Original line number Diff line number Diff line
@@ -3972,7 +3972,9 @@ public class Notification implements Parcelable 
        @Override

        public void purgeResources() {

            super.purgeResources();

            if (mPicture != null && mPicture.isMutable()) {

            if (mPicture != null &&

                mPicture.isMutable() &&

                mPicture.getAllocationByteCount() >= (128 * (1 << 10))) {

                mPicture = mPicture.createAshmemBitmap();

            }

            if (mBigLargeIcon != null) {

core/jni/android/graphics/Bitmap.cpp

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <cutils/ashmem.h>



#define DEBUG_PARCEL 0

#define ASHMEM_BITMAP_MIN_SIZE (128 * (1 << 10))



namespace android {
@@ -993,7 +994,7 @@ static jobject Bitmap_createFromParcel(JNIEnv* env, jobject, jobject parcel) { 


    // Map the bitmap in place from the ashmem region if possible otherwise copy.

    Bitmap* nativeBitmap;

    if (blob.fd() >= 0 && (blob.isMutable() || !isMutable)) {

    if (blob.fd() >= 0 && (blob.isMutable() || !isMutable) && (size >= ASHMEM_BITMAP_MIN_SIZE)) {

#if DEBUG_PARCEL

        ALOGD("Bitmap.createFromParcel: mapped contents of %s bitmap from %s blob "

                "(fds %s)",

graphics/java/android/graphics/drawable/Icon.java

+3 −1
Original line number Diff line number Diff line
@@ -382,7 +382,9 @@ public final class Icon implements Parcelable { 
     * @hide

     */

    public void convertToAshmem() {

        if (mType == TYPE_BITMAP && getBitmap().isMutable()) {

        if (mType == TYPE_BITMAP &&

            getBitmap().isMutable() &&

            getBitmap().getAllocationByteCount() >= (128 * (1 << 10))) {

            setBitmap(getBitmap().createAshmemBitmap());

        }

    }