commit 8a207962ec84904a0fb8c7b5ce547ed2d1b59794
author John Reck <jreck@google.com> Fri Oct 04 13:30:51 2019 -0700
committer John Reck <jreck@google.com> Fri Oct 04 13:30:51 2019 -0700
tree 37f059af1d3fa5d50087adf469ac6f135f20bd5e
parent 781630e4b4d67e0371c133ae64923ede1b989250

Drop all caches in UI_HIDDEN

Bug: 137853925
Test: none
Change-Id: Idf7002d9b07cc6b71b38ce76e7b6382100279a99

libs/hwui/renderthread/CacheManager.cpp

diff --git a/libs/hwui/renderthread/CacheManager.cpp b/libs/hwui/renderthread/CacheManager.cpp
index fc26813..20e607d 100644
--- a/libs/hwui/renderthread/CacheManager.cpp
+++ b/libs/hwui/renderthread/CacheManager.cpp
@@ -135,7 +135,7 @@
         return;
     }
     mGrContext->flush();
-    mGrContext->purgeResourcesNotUsedInMs(std::chrono::seconds(30));
+    mGrContext->performDeferredCleanup(std::chrono::seconds(30));
 }
 
 sp<skiapipeline::VectorDrawableAtlas> CacheManager::acquireVectorDrawableAtlas() {

libs/hwui/renderthread/CanvasContext.cpp

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 30cc007..93fd0c8 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -646,11 +646,11 @@
     ATRACE_CALL();
     if (!thread.getGrContext()) return;
     ATRACE_CALL();
-    if (level >= TRIM_MEMORY_COMPLETE) {
+    if (level >= TRIM_MEMORY_UI_HIDDEN) {
         thread.cacheManager().trimMemory(CacheManager::TrimMemoryMode::Complete);
+    }
+    if (level >= TRIM_MEMORY_COMPLETE) {
         thread.destroyRenderingContext();
-    } else if (level >= TRIM_MEMORY_UI_HIDDEN) {
-        thread.cacheManager().trimMemory(CacheManager::TrimMemoryMode::UiHidden);
     }
 }