am beb8be60: Merge "Fixing crash when taking screenshot over secure window." into ics-mr1 (bc72272c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java

+8 −7

Original line number	Diff line number	Diff line
		@@ -358,7 +358,15 @@ class GlobalScreenshot {
		dims[0] = Math.abs(dims[0]);
		dims[1] = Math.abs(dims[1]);
		}

		// Take the screenshot
		mScreenBitmap = Surface.screenshot((int) dims[0], (int) dims[1]);
		if (mScreenBitmap == null) {
		notifyScreenshotError(mContext, mNotificationManager);
		finisher.run();
		return;
		}

		if (requiresRotation) {
		// Rotate the screenshot to the current orientation
		Bitmap ss = Bitmap.createBitmap(mDisplayMetrics.widthPixels,
		@@ -372,13 +380,6 @@ class GlobalScreenshot {
		mScreenBitmap = ss;
		}

		// If we couldn't take the screenshot, notify the user
		if (mScreenBitmap == null) {
		notifyScreenshotError(mContext, mNotificationManager);
		finisher.run();
		return;
		}

		// Optimizations
		mScreenBitmap.setHasAlpha(false);
		mScreenBitmap.prepareToDraw();