am 103bc334: Merge "Clearing screenshot bitmap references and recycling bitmap data immediately after saving. (Bug 7974275)"
* commit '103bc3342efe2a8a9a3a26f2e115bd1b58e0ed77':
Clearing screenshot bitmap references and recycling bitmap data immediately after saving. (Bug 7974275)
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
index db9b219..17b0b50 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
@@ -220,13 +220,21 @@
resolver.update(uri, values, null, null);
params[0].imageUri = uri;
+ params[0].image = null;
params[0].result = 0;
} catch (Exception e) {
// IOException/UnsupportedOperationException may be thrown if external storage is not
// mounted
+ params[0].imageUri = null;
+ params[0].image = null;
params[0].result = 1;
}
+ // Recycle the bitmap data
+ if (image != null) {
+ image.recycle();
+ }
+
return params[0];
}
@@ -461,6 +469,10 @@
// Save the screenshot once we have a bit of time now
saveScreenshotInWorkerThread(finisher);
mWindowManager.removeView(mScreenshotLayout);
+
+ // Clear any references to the bitmap
+ mScreenBitmap = null;
+ mScreenshotView.setImageBitmap(null);
}
});
mScreenshotLayout.post(new Runnable() {