DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master

Bug: 120502534 Change-Id: I7351a1832c4bd2fd86324183ab83e9088d716822
2018-12-10 12:30:19 -08:00
parent f1f26e1165 7409b8620f
commit 75f75c18cc
150 changed files with 2674 additions and 881 deletions
--- a/libs/hwui/hwui/Bitmap.cpp
+++ b/libs/hwui/hwui/Bitmap.cpp
@@ -223,6 +223,7 @@ Bitmap::~Bitmap() {
            break;
        case PixelStorageType::Heap:
            free(mPixelStorage.heap.address);
+            mallopt(M_PURGE, 0);
            break;
        case PixelStorageType::Hardware:
            auto buffer = mPixelStorage.hardware.buffer;
@@ -230,7 +231,6 @@ Bitmap::~Bitmap() {
            mPixelStorage.hardware.buffer = nullptr;
            break;
    }
-
    android::uirenderer::renderthread::RenderProxy::onBitmapDestroyed(getStableID());
 }