summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2014-08-29 18:52:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-29 18:52:48 +0000
commitecb8785efcc6ce1e5c7a244b147df338fd434bfe (patch)
tree6faae961baeafd1a8a92cedb132b52fff0774d10 /libs
parent5acf03c481a20a7e81a8a782c9656ed71ced8361 (diff)
parenteb50b8578df06d2423cfcc85ae088d604e081c30 (diff)
downloadframeworks_base-ecb8785efcc6ce1e5c7a244b147df338fd434bfe.zip
frameworks_base-ecb8785efcc6ce1e5c7a244b147df338fd434bfe.tar.gz
frameworks_base-ecb8785efcc6ce1e5c7a244b147df338fd434bfe.tar.bz2
am 1099d64b: am 09a0c7c8: Merge "Free prefetched layers on TRIM_MEMORY" into lmp-dev
* commit '1099d64b40f555da92a7aee56c55a20a6f5c24f8': Free prefetched layers on TRIM_MEMORY
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/renderthread/CanvasContext.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index ecfedf6..491a295 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -314,6 +314,7 @@ void CanvasContext::destroyHardwareResources() {
stopDrawing();
if (mEglManager.hasEglContext()) {
requireGlContext();
+ freePrefetechedLayers();
mRootRenderNode->destroyHardwareResources();
Caches::getInstance().flush(Caches::kFlushMode_Layers);
}