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

am beb8be60: Merge "Fixing crash when taking screenshot over secure window." into ics-mr1

Browse Source 
* commit 'beb8be60d157e4812e0195c2e445aa0abb82d9a2':
  Fixing crash when taking screenshot over secure window.
This commit is contained in:
Justin Ho
2012-01-06 14:10:01 -08:00
committed by Android Git Automerger
parent 7db47a42f1 beb8be60d1
commit bc72272cc0
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,7 +358,15 @@ class GlobalScreenshot {
dims[0] = Math.abs(dims[0]); dims[0] = Math.abs(dims[0]);
dims[1] = Math.abs(dims[1]); dims[1] = Math.abs(dims[1]);
} }
// Take the screenshot
mScreenBitmap = Surface.screenshot((int) dims[0], (int) dims[1]); mScreenBitmap = Surface.screenshot((int) dims[0], (int) dims[1]);
if (mScreenBitmap == null) {
notifyScreenshotError(mContext, mNotificationManager);
finisher.run();
return;
}
if (requiresRotation) { if (requiresRotation) {
// Rotate the screenshot to the current orientation // Rotate the screenshot to the current orientation
Bitmap ss = Bitmap.createBitmap(mDisplayMetrics.widthPixels, Bitmap ss = Bitmap.createBitmap(mDisplayMetrics.widthPixels,
@ -372,13 +380,6 @@ class GlobalScreenshot {
mScreenBitmap = ss; mScreenBitmap = ss;
} }
// If we couldn't take the screenshot, notify the user
if (mScreenBitmap == null) {
notifyScreenshotError(mContext, mNotificationManager);
finisher.run();
return;
}
// Optimizations // Optimizations
mScreenBitmap.setHasAlpha(false); mScreenBitmap.setHasAlpha(false);
mScreenBitmap.prepareToDraw(); mScreenBitmap.prepareToDraw();