summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2018-10-15 16:50:23 -0700
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-10-20 00:17:52 +0000
commit64ea6ca2e39b779495feb695033c414ebfe62ac0 (patch)
tree08227f9023cb15b6446ac1d1b5b2e5171fedb36d
parent7d4945ca8664c7e5def08ce4bbd6841a1bfac174 (diff)
downloadbase-64ea6ca2e39b779495feb695033c414ebfe62ac0.tar.gz
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 Merged-in: I4b5e0db50c2b7adaa71cb0d22535c1b37c7523e8 Change-Id: I4b5e0db50c2b7adaa71cb0d22535c1b37c7523e8 (cherry picked from commit 9b4eaf740957663b01d4bf056df250dd028e0cb0)
-rw-r--r--services/core/java/com/android/server/wm/TaskSnapshotPersister.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/TaskSnapshotPersister.java b/services/core/java/com/android/server/wm/TaskSnapshotPersister.java
index a642e6ab744a..d1c0443c58e1 100644
--- a/services/core/java/com/android/server/wm/TaskSnapshotPersister.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotPersister.java
@@ -360,6 +360,7 @@ class TaskSnapshotPersister {
// For snapshots with reduced resolution, do not create or save full sized bitmaps
if (mSnapshot.isReducedResolution()) {
+ swBitmap.recycle();
return true;
}
@@ -372,6 +373,8 @@ class TaskSnapshotPersister {
Slog.e(TAG, "Unable to open " + file + " for persisting.", e);
return false;
}
+ reduced.recycle();
+ swBitmap.recycle();
return true;
}
}