commit af85392b5142c6332da48260c0f3be5e990a19b2
author Tim Murray <timmurray@google.com> Mon Oct 15 16:50:23 2018 -0700
committer Tim Murray <timmurray@google.com> Fri Oct 19 02:29:29 2018 +0000
tree 2cd280a5f44e8fbe246c0dcac3415eb88025cff3
parent a354de4c962e18236f93da59b816a0e235a65aea

wm: recycle bitmaps immediately in TaskSnapshotPersister

Bitmap created in TaskSnapshotPersister are very short lived and
shouldn't be left around in the Java heap.

Test: boot, switch apps, works
bug 117795621

Exempt-From-Owner-Approval: approved in another branch
Change-Id: I4b5e0db50c2b7adaa71cb0d22535c1b37c7523e8

services/core/java/com/android/server/wm/TaskSnapshotPersister.java

diff --git a/services/core/java/com/android/server/wm/TaskSnapshotPersister.java b/services/core/java/com/android/server/wm/TaskSnapshotPersister.java
index 21e807e..6fd1795 100644
--- a/services/core/java/com/android/server/wm/TaskSnapshotPersister.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotPersister.java
@@ -17,6 +17,7 @@
 package com.android.server.wm;
 
 import static android.graphics.Bitmap.CompressFormat.*;
+
 import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
 import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
 
@@ -361,6 +362,7 @@
 
             // For snapshots with reduced resolution, do not create or save full sized bitmaps
             if (mSnapshot.isReducedResolution()) {
+                swBitmap.recycle();
                 return true;
             }
 
@@ -373,6 +375,8 @@
                 Slog.e(TAG, "Unable to open " + file + " for persisting.", e);
                 return false;
             }
+            reduced.recycle();
+            swBitmap.recycle();
             return true;
         }
     }