From 8a207962ec84904a0fb8c7b5ce547ed2d1b59794 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Fri, 4 Oct 2019 13:30:51 -0700
Subject: [PATCH] Drop all caches in UI_HIDDEN

Bug: 137853925
Test: none
Change-Id: Idf7002d9b07cc6b71b38ce76e7b6382100279a99
---
 libs/hwui/renderthread/CacheManager.cpp  | 2 +-
 libs/hwui/renderthread/CanvasContext.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/hwui/renderthread/CacheManager.cpp b/libs/hwui/renderthread/CacheManager.cpp
index fc268138e071a..20e607dfe6c09 100644
--- a/libs/hwui/renderthread/CacheManager.cpp
+++ b/libs/hwui/renderthread/CacheManager.cpp
@@ -135,7 +135,7 @@ void CacheManager::trimStaleResources() {
         return;
     }
     mGrContext->flush();
-    mGrContext->purgeResourcesNotUsedInMs(std::chrono::seconds(30));
+    mGrContext->performDeferredCleanup(std::chrono::seconds(30));
 }
 
 sp<skiapipeline::VectorDrawableAtlas> CacheManager::acquireVectorDrawableAtlas() {
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 30cc007d454b1..93fd0c87a361b 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -646,11 +646,11 @@ void CanvasContext::trimMemory(RenderThread& thread, int level) {
     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);
     }
 }