commit a6e8ebb12f2d451236fc354778d2a916ed2fb0ef
author Dianne Hackborn <hackbod@google.com> Wed Apr 17 19:07:03 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 17 19:07:03 2013 -0700
tree 3e022925ad95d755460a769d84e70be789c9dc8c
parent 95be338f9bbc7341aec9fc26bfb36e164ba3dd94
parent fb4e1c21eddf07fad7b36ac5e19dd2d479e71c5c

am fb4e1c21: am 25b49734: Merge "Fix issue #8540550: Screenshots should never have transparency" into jb-mr2-dev

* commit 'fb4e1c21eddf07fad7b36ac5e19dd2d479e71c5c':
  Fix issue #8540550: Screenshots should never have transparency

services/java/com/android/server/wm/WindowManagerService.java

diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index a16a8e6..a5df7d9 100644
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -5567,6 +5567,7 @@
         ScreenRotationAnimation.createRotationMatrix(rot, dw, dh, matrix);
         matrix.postTranslate(-FloatMath.ceil(frame.left*scale), -FloatMath.ceil(frame.top*scale));
         Canvas canvas = new Canvas(bm);
+        canvas.drawColor(0xFF000000);
         canvas.drawBitmap(rawss, matrix, null);
         canvas.setBitmap(null);