commit 2d18c688d43a71424e978c256ca741e319faf1e1
author Winson Chung <winsonc@google.com> Tue Apr 24 21:32:22 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 24 21:32:22 2018 +0000
tree 8558b5bc999b93d379372aeffc2f0508c8b960d5
parent 8546213d01248fd3ae4ea94493db92b058896081
parent dea51350d6ecd7c3425c0d0f5a3551d93ce173d9

Merge "Send trim memory to trim icon cache when stopped" into ub-launcher3-edmonton

quickstep/src/com/android/quickstep/RecentsActivity.java

diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 0185ab9..3c47eec 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -226,6 +226,14 @@
     }
 
     @Override
+    protected void onStop() {
+        super.onStop();
+
+        // Workaround for b/78520668, explicitly trim memory once UI is hidden
+        UiFactory.onTrimMemory(this, TRIM_MEMORY_UI_HIDDEN);
+    }
+
+    @Override
     public void onTrimMemory(int level) {
         super.onTrimMemory(level);
         UiFactory.onTrimMemory(this, level);

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 0aa760e..1285a2b 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -737,6 +737,8 @@
         NotificationListener.removeNotificationsChangedListener();
         getStateManager().moveToRestState();
 
+        // Workaround for b/78520668, explicitly trim memory once UI is hidden
+        UiFactory.onTrimMemory(this, TRIM_MEMORY_UI_HIDDEN);
     }
 
     @Override