drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clearing screenshot bitmap references and recycling bitmap data immediately after saving. (Bug 7974275)"

Browse Source
This commit is contained in:
Winson Chung
2013-01-17 00:27:19 +00:00
committed by Android (Google) Code Review
parent b16dcd14b5 cd6a9ef58c
commit 103bc3342e
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
View File

@ -220,13 +220,21 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi
resolver.update(uri, values, null, null); resolver.update(uri, values, null, null);
params[0].imageUri = uri; params[0].imageUri = uri;
params[0].image = null;
params[0].result = 0; params[0].result = 0;
} catch (Exception e) { } catch (Exception e) {
// IOException/UnsupportedOperationException may be thrown if external storage is not // IOException/UnsupportedOperationException may be thrown if external storage is not
// mounted // mounted
params[0].imageUri = null;
params[0].image = null;
params[0].result = 1; params[0].result = 1;
} }
// Recycle the bitmap data
if (image != null) {
image.recycle();
}
return params[0]; return params[0];
} }
@ -461,6 +469,10 @@ class GlobalScreenshot {
// Save the screenshot once we have a bit of time now // Save the screenshot once we have a bit of time now
saveScreenshotInWorkerThread(finisher); saveScreenshotInWorkerThread(finisher);
mWindowManager.removeView(mScreenshotLayout); mWindowManager.removeView(mScreenshotLayout);
// Clear any references to the bitmap
mScreenBitmap = null;
mScreenshotView.setImageBitmap(null);
} }
}); });
mScreenshotLayout.post(new Runnable() { mScreenshotLayout.post(new Runnable() {