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

Commit ac3e355b authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge changes I00b54796,Iac465b72 

* changes:
  Change max heap size to 48MB
  Fix memory leak in OpenGLRenderer.
parents 4d65fdc8 83c033de

build/phone-hdpi-512-dalvik-heap.mk

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ 


PRODUCT_PROPERTY_OVERRIDES += \

    dalvik.vm.heapstartsize=5m \

    dalvik.vm.heapgrowthlimit=32m \

    dalvik.vm.heapgrowthlimit=48m \

    dalvik.vm.heapsize=128m

libs/hwui/DisplayListRenderer.h

+3 −1
Original line number Diff line number Diff line
@@ -419,7 +419,9 @@ private: 
    inline void addMatrix(SkMatrix* matrix) {

        // Copying the matrix is cheap and prevents against the user changing the original

        // matrix before the operation that uses it

        addInt((int) new SkMatrix(*matrix));

        SkMatrix* copy = new SkMatrix(*matrix);

        addInt((int) copy);

        mMatrices.add(copy);

    }



    inline void addBitmap(SkBitmap* bitmap) {