Use Surface layer for Surface operation.

Craig Mautner · Craig Mautner · commit 881656831c97 · 2012-05-31T14:25:31.000-07:00
Previous fix exposed an existing bug where we were using mAnimLayer to
determine the highest Surface layer. This fix uses mSurfaceLayer to set
the layer limits for making the screenshot.

Fixes bug 6586168.

Change-Id: Iaa3b43867aef795ca617ff4b8076428dfc91eaf2
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
@@ -5437,8 +5437,8 @@ public Bitmap screenshotApplications(IBinder appToken, int width, int height) {
                 // window.
                 including = !ws.mIsImWindow && !ws.isFullscreen(dw, dh);
 
-                if (maxLayer < ws.mWinAnimator.mAnimLayer) {
-                    maxLayer = ws.mWinAnimator.mAnimLayer;
+                if (maxLayer < ws.mWinAnimator.mSurfaceLayer) {
+                    maxLayer = ws.mWinAnimator.mSurfaceLayer;
                 }
                 
                 // Don't include wallpaper in bounds calculation

Original file line number	Diff line number	Diff line change
`@@ -5437,8 +5437,8 @@ public Bitmap screenshotApplications(IBinder appToken, int width, int height) {`
`5437`	`5437`	`// window.`
`5438`	`5438`	`including = !ws.mIsImWindow && !ws.isFullscreen(dw, dh);`
`5439`	`5439`
`5440`		`- if (maxLayer < ws.mWinAnimator.mAnimLayer) {`
`5441`		`- maxLayer = ws.mWinAnimator.mAnimLayer;`
	`5440`	`+ if (maxLayer < ws.mWinAnimator.mSurfaceLayer) {`
	`5441`	`+ maxLayer = ws.mWinAnimator.mSurfaceLayer;`
`5442`	`5442`	`}`
`5443`	`5443`
`5444`	`5444`	`// Don't include wallpaper in bounds calculation`